Merge branch 'master' of ssh://glfw.git.sourceforge.net/gitroot/glfw/glfw

Conflicts:
	examples/CMakeLists.txt
This commit is contained in:
Camilla Berglund
2010-09-25 19:13:40 +02:00
4 changed files with 865 additions and 3 deletions
+3 -2
View File
@@ -40,10 +40,11 @@
#include <X11/Xlib.h>
#include <X11/keysym.h>
#include <X11/Xatom.h>
#define GLX_GLXEXT_LEGACY 1
#include <GL/glx.h>
#include "../../include/GL/glfw3.h"
#include "../../include/GL/glxext.h"
#include "../../include/GL/glfw3.h"
// We need declarations for GLX version 1.3 or above even if the server doesn't
// support version 1.3