Camilla Berglund 692f34b536 Merge branch 'master' into multi-monitor ... Conflicts: include/GL/glfw3.h src/window.c tests/glfwinfo.c		2012-12-22 19:40:15 +01:00
..
GL	Merge branch 'master' into multi-monitor	2012-12-22 19:40:15 +01:00