diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-02-28 12:48:31 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-02-28 12:48:31 -0800 |
| commit | a5a94fb703b08363aa7c5f5256a682e1bf81f034 (patch) | |
| tree | 1a591987bf10fd9164353865ac4bfba569d543ea /AUTHORS | |
| parent | a5f8c63184234b2a6840d86f90e6a4630e73936d (diff) | |
| parent | 94cb8f99fb7faac9a48ea66ac37b9e87b5c92582 (diff) | |
Merge branch 'incoming' of github.com:DerKoun/emscripten-fullscreen-improvements into incoming
Conflicts:
AUTHORS
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -128,4 +128,5 @@ a license to everyone to use it as detailed in LICENSE.) * Joel Croteau <jcroteau@gmail.com> * Haneef Mubarak <haneef503@gmail.com> * Nicolas Peri <nicox@shivaengine.com> (copyright owned by ShiVa Technologies, SAS) +* Bernhard Fey <e-male@web.de> |