Merge branch '7.8'

Conflicts:

	src/glx/dri2_glx.c
	src/glx/glx_pbuffer.c
This commit is contained in:
Brian Paul
2010-04-28 07:21:25 -06:00
75 changed files with 53505 additions and 103 deletions

View File

@@ -30,7 +30,7 @@
* Kristian Høgsberg (krh@redhat.com)
*/
#ifdef GLX_DIRECT_RENDERING
#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
#include <X11/Xlib.h>
#include <X11/extensions/Xfixes.h>