From df05a2d8a50993968557f6d0073b60a50d259ca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 29 May 2014 21:02:57 +0200 Subject: [PATCH] Properly credit all contributors. --- CONTRIBUTORS.md | 14 ++++++++++++++ README.md | 8 +++++++- src/Magnum/Platform/WindowlessCglApplication.cpp | 2 ++ src/Magnum/Platform/WindowlessCglApplication.h | 2 ++ 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 CONTRIBUTORS.md diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md new file mode 100644 index 000000000..5de717cf0 --- /dev/null +++ b/CONTRIBUTORS.md @@ -0,0 +1,14 @@ +Contributors to Magnum library +------------------------------ + +* Miguel Martin ([@miguelmartin75](https://github.com/miguelmartin75)) -- + initial Mac OS X port, various other improvements +* Travis Watkins ([@amaranth](https://github.com/amaranth)) -- support for + windowless applications under Mac OS X +* [@ArEnSc](https://github.com/ArEnSc) / [@michael-chung](https://github.com/michael-chung) -- + initial implementation of windowless applications under Mac OS X, Mac OS X + port improvements +* Stefan Wasilewski ([@smw](https://github.com/smw)) -- Mac OS X port + improvements + +Big thanks to everyone involved! diff --git a/README.md b/README.md index ffa8e951d..c8ab38890 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ Platforms: * **Linux** and embedded Linux (natively using GLX/EGL and Xlib or through SDL2 or GLUT toolkit) * **Windows** (through SDL2 or GLUT toolkit) -* **OS X** (through SDL2 toolkit, thanks to [Miguel Martin](https://github.com/miguelishawt)) +* **OS X** (through SDL2 toolkit) * **Android** 2.3 (API Level 9) and higher * **Google Chrome** (through [Native Client](https://developers.google.com/native-client/), both `newlib` and `glibc` toolchains are supported) @@ -171,6 +171,12 @@ idea? Feel free to visit my website or contact me at: * E-mail -- mosra@centrum.cz * Jabber -- mosra@jabbim.cz +CONTRIBUTORS +============ + +See [CONTRIBUTORS.md](CONTRIBUTORS.md) file for details. Big thanks to everyone +involved! + LICENSE ======= diff --git a/src/Magnum/Platform/WindowlessCglApplication.cpp b/src/Magnum/Platform/WindowlessCglApplication.cpp index 89ff6d162..207e0fd60 100644 --- a/src/Magnum/Platform/WindowlessCglApplication.cpp +++ b/src/Magnum/Platform/WindowlessCglApplication.cpp @@ -3,6 +3,8 @@ Copyright © 2010, 2011, 2012, 2013, 2014 Vladimír Vondruš + Copyright © 2013 + Copyright © 2014 Travis Watkins Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Platform/WindowlessCglApplication.h b/src/Magnum/Platform/WindowlessCglApplication.h index c397681de..f86274ac1 100644 --- a/src/Magnum/Platform/WindowlessCglApplication.h +++ b/src/Magnum/Platform/WindowlessCglApplication.h @@ -5,6 +5,8 @@ Copyright © 2010, 2011, 2012, 2013, 2014 Vladimír Vondruš + Copyright © 2013 + Copyright © 2014 Travis Watkins Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),