xserver: Branch 'master'

[Keith Packard]

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

New commits:
commit 7fe5e6dfa5c1e71d8b7540b28c1d508687a2fbee
Author: Jasper St. Pierre <jstpierre at mecheye.net>
Date:   Wed Jan 23 13:11:55 2013 -0500

    protocol-versions: Bump minor version of XI
    
    This was accidentally excluded when we added barriers.
    
    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 cb8e213..10f5117 100644
--- a/include/protocol-versions.h
+++ b/include/protocol-versions.h
@@ -127,7 +127,7 @@
 
 /* X Input */
 #define SERVER_XI_MAJOR_VERSION			2
-#define SERVER_XI_MINOR_VERSION			2
+#define SERVER_XI_MINOR_VERSION			3
 
 /* XKB */
 #define SERVER_XKB_MAJOR_VERSION		1