ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Properly credit all contributors.

pull/276/head
Vladimír Vondruš 12 years ago
parent
181eefd8f8
commit
df05a2d8a5
4 changed files with 25 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      CONTRIBUTORS.md
  2. 8
      README.md
  3. 2
      src/Magnum/Platform/WindowlessCglApplication.cpp
  4. 2
      src/Magnum/Platform/WindowlessCglApplication.h

14
CONTRIBUTORS.md
Unescape View File

@ -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!

8
README.md
Unescape View File

@ -51,7 +51,7 @@ Platforms:
* **Linux** and embedded Linux (natively using GLX/EGL and Xlib or through * **Linux** and embedded Linux (natively using GLX/EGL and Xlib or through
SDL2 or GLUT toolkit) SDL2 or GLUT toolkit)
* **Windows** (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 * **Android** 2.3 (API Level 9) and higher
* **Google Chrome** (through [Native Client](https://developers.google.com/native-client/), * **Google Chrome** (through [Native Client](https://developers.google.com/native-client/),
both `newlib` and `glibc` toolchains are supported) 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 * E-mail -- mosra@centrum.cz
* Jabber -- mosra@jabbim.cz * Jabber -- mosra@jabbim.cz
CONTRIBUTORS
============
See [CONTRIBUTORS.md](CONTRIBUTORS.md) file for details. Big thanks to everyone
involved!
LICENSE LICENSE
======= =======

2
src/Magnum/Platform/WindowlessCglApplication.cpp
Unescape View File

@ -3,6 +3,8 @@
Copyright © 2010, 2011, 2012, 2013, 2014 Copyright © 2010, 2011, 2012, 2013, 2014
Vladimír Vondruš <mosra@centrum.cz> Vladimír Vondruš <mosra@centrum.cz>
Copyright © 2013 <https://github.com/ArEnSc>
Copyright © 2014 Travis Watkins <https://github.com/amaranth>
Permission is hereby granted, free of charge, to any person obtaining a Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"), copy of this software and associated documentation files (the "Software"),

2
src/Magnum/Platform/WindowlessCglApplication.h
Unescape View File

@ -5,6 +5,8 @@
Copyright © 2010, 2011, 2012, 2013, 2014 Copyright © 2010, 2011, 2012, 2013, 2014
Vladimír Vondruš <mosra@centrum.cz> Vladimír Vondruš <mosra@centrum.cz>
Copyright © 2013 <https://github.com/ArEnSc>
Copyright © 2014 Travis Watkins <https://github.com/amaranth>
Permission is hereby granted, free of charge, to any person obtaining a Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"), copy of this software and associated documentation files (the "Software"),

Write Preview
Loading…
Cancel
Save