xserver: Branch 'master'

[Keith Packard]

 include/protocol-versions.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c65280ce8df4836bd7424a90482e8aa00ab6f447
Author: Robert Hooker <sarvatt at ubuntu.com>
Date:   Sat Jun 12 20:23:09 2010 -0400

    Increase advertised RENDER protocol minor version to 11
    
    Support for the blend mode operators was added in
    0ce42adbf4cff9e7f049d9fc79d588ece5936177
    and the requirement was bumped but when things were split off into
    include/protocol-versions.h it defined it to 10. render uses
    the lower of the client and server advertised versions so it's not
    using the new blend mode operators.
    
    Signed-off-by: Robert Hooker <sarvatt at ubuntu.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/include/protocol-versions.h b/include/protocol-versions.h
index 97ef5da..c674465 100644
--- a/include/protocol-versions.h
+++ b/include/protocol-versions.h
@@ -73,7 +73,7 @@
 
 /* Render */
 #define SERVER_RENDER_MAJOR_VERSION		0
-#define SERVER_RENDER_MINOR_VERSION		10
+#define SERVER_RENDER_MINOR_VERSION		11
 
 /* RandR Xinerama */
 #define SERVER_RRXINERAMA_MAJOR_VERSION		1