| commit | 854e634fec4475ac3aaf0ec7408d601a0e4eeb5d | [log] [tgz] |
|---|---|---|
| author | Camilla Berglund <elmindreda@elmindreda.org> | Fri Aug 03 02:57:33 2012 +0200 |
| committer | Camilla Berglund <elmindreda@elmindreda.org> | Fri Aug 03 02:57:33 2012 +0200 |
| tree | 3fc2c41e59c2ea7b968fe0d38cd17ece6553aa45 | |
| parent | f4880b920661822e1c984dd6b3212b736b67c7bf [diff] | |
| parent | 3c912cbc3c754874fe3e3eeb7e78f3dae1cb328d [diff] |
Merge branch 'master' into multi-monitor Conflicts: include/GL/glfw3.h src/CMakeLists.txt src/fullscreen.c src/internal.h src/win32_fullscreen.c src/win32_platform.h src/x11_fullscreen.c tests/modes.c