xserver: Branch 'master'

[Keith Packard]

 hw/xfree86/dri2/dri2ext.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9a2f6135bfb0f12ec28f304c97917d2f7c64db05
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Oct 23 10:04:57 2009 +0900

    DRI2: Report the correct extension minor version
    
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
index 6c14578..dc07b47 100644
--- a/hw/xfree86/dri2/dri2ext.c
+++ b/hw/xfree86/dri2/dri2ext.c
@@ -81,7 +81,7 @@ ProcDRI2QueryVersion(ClientPtr client)
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
     rep.majorVersion = SERVER_DRI2_MAJOR_VERSION;
-    rep.minorVersion = SERVER_DRI2_MAJOR_VERSION;
+    rep.minorVersion = SERVER_DRI2_MINOR_VERSION;
 
     if (client->swapped) {
     	swaps(&rep.sequenceNumber, n);