| commit | cbcab56a25b27870c180bf676f8a7f660c00b653 | [log] [tgz] |
|---|---|---|
| author | Camilla Berglund <elmindreda@elmindreda.org> | Thu Sep 06 21:05:03 2012 +0200 |
| committer | Camilla Berglund <elmindreda@elmindreda.org> | Thu Sep 06 21:05:03 2012 +0200 |
| tree | a92e31530f6ce09e356087fbe49ac793825a0caa | |
| parent | a182acd5855bdce144b9ddbd1ccf82d00df7ade4 [diff] | |
| parent | a339098bc01b246d67ad165bcd2380ce51d666db [diff] |
Merge branch 'master' into EGL Conflicts: include/GL/glfw3.h src/opengl.c src/win32_opengl.c src/window.c src/x11_fullscreen.c src/x11_glx_opengl.c src/x11_platform.h src/x11_window.c tests/glfwinfo.c