xserver: Branch 'master'

[Keith Packard]

 composite/compext.c |    6 +-----
 1 files changed, 1 insertion(+), 5 deletions(-)

New commits:
diff-tree f106c04b627d9f57b38627971dc79c75129e66d6 (from 4f88d68bdb90cc7d12170355105b4fd020acd306)
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Tue Jul 3 14:47:19 2007 -0700

    Have Composite always report server version.
    
    It was reporting the lessor of the server and client versions, which doesn't
    make sense with the 0.4 semantic change in clipping.

diff --git a/composite/compext.c b/composite/compext.c
index 9cf6bfe..944f8d8 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -138,11 +138,7 @@ ProcCompositeQueryVersion (ClientPtr cli
 	rep.minorVersion = stuff->minorVersion;
     } else {
 	rep.majorVersion = SERVER_COMPOSITE_MAJOR;
-	if (stuff->majorVersion == SERVER_COMPOSITE_MAJOR && 
-	    stuff->minorVersion < SERVER_COMPOSITE_MINOR)
-	    rep.minorVersion = stuff->minorVersion;
-	else
-	    rep.minorVersion = SERVER_COMPOSITE_MINOR;
+        rep.minorVersion = SERVER_COMPOSITE_MINOR;
     }
     pCompositeClient->major_version = rep.majorVersion;
     pCompositeClient->minor_version = rep.minorVersion;