xserver: Branch 'master'

[Adam Jackson]

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

New commits:
commit abb9b58d1af9a0286162e52ef9db390d0c950fc1
Author: Thierry Reding <treding at nvidia.com>
Date:   Fri Mar 16 14:24:21 2018 +0100

    present: Advertise protocol version 1.2
    
    Everything is implemented to support protocol version 1.2. Make it
    official.
    
    Reviewed-by: Daniel Stone <daniels at collabora.com>
    Signed-off-by: Thierry Reding <treding at nvidia.com>
    Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

diff --git a/include/protocol-versions.h b/include/protocol-versions.h
index 7cab7cd5b..8e149b27f 100644
--- a/include/protocol-versions.h
+++ b/include/protocol-versions.h
@@ -69,7 +69,7 @@
 
 /* Present */
 #define SERVER_PRESENT_MAJOR_VERSION            1
-#define SERVER_PRESENT_MINOR_VERSION            1
+#define SERVER_PRESENT_MINOR_VERSION            2
 
 /* RandR */
 #define SERVER_RANDR_MAJOR_VERSION		1