Merge branch 'master' into multi-monitor

Conflicts:
	src/CMakeLists.txt
	src/internal.h
	src/x11_platform.h
This commit is contained in:
Camilla Berglund
2012-08-29 20:36:07 +02:00
49 changed files with 633 additions and 2722 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
//========================================================================
// GLFW - An OpenGL library
// Platform: Win32/WGL
// Platform: Win32
// API version: 3.0
// WWW: http://www.glfw.org/
//------------------------------------------------------------------------