Camilla Berglund 854e634fec 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		2012-08-03 02:57:33 +02:00
..
GL	Merge branch 'master' into multi-monitor	2012-08-03 02:57:33 +02:00