xserver: Branch 'master'

[Keith Packard]

 glx/glxdriswrast.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 77221c9155a3c96cb63b210a048db1ea71a5e359
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Oct 29 14:01:29 2009 -0400

    glx: swrast can do GLX 1.4 too
    
    Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
index 44f658f..20f9f90 100644
--- a/glx/glxdriswrast.c
+++ b/glx/glxdriswrast.c
@@ -510,6 +510,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
 
     __glXScreenInit(&screen->base, pScreen);
 
+    screen->base.GLXmajor = 1;
+    screen->base.GLXminor = 4;
+
     LogMessage(X_INFO,
 	       "AIGLX: Loaded and initialized %s\n", filename);