Merge branch 'master' into multi-display-support

Conflicts:
	src/fullscreen.c
	src/win32_window.c
	src/x11_fullscreen.c
This commit is contained in:
Marcel Metz
2011-10-07 00:35:37 -04:00
11 changed files with 97 additions and 84 deletions
+3
View File
@@ -41,6 +41,9 @@
#define GLX_GLXEXT_LEGACY
#include <GL/glx.h>
// This path may need to be changed if you build GLFW using your own setup
// We ship and use our own copy of glxext.h since GLFW uses fairly new
// extensions and not all operating systems come with an up-to-date version
#include "../support/GL/glxext.h"