xserver: Branch 'master'

[Adam Jackson]

 dix/protocol.txt |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 85ff1cdbd3286838e512fe7c70af149a8743b6fe
Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Tue Feb 27 17:05:50 2018 +0000

    protocol.txt: add GLX req. 35 - SetClientInfo2ARB
    
    Noticed while skimming for the typo'd version ;-)
    
    Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
    Reviewed-by: Adam Jackson <ajax at redhat.com>

diff --git a/dix/protocol.txt b/dix/protocol.txt
index 244556a08..a1bf93652 100644
--- a/dix/protocol.txt
+++ b/dix/protocol.txt
@@ -149,6 +149,7 @@ R031 GLX:CreateWindow
 R032 GLX:DeleteWindow
 R033 GLX:SetClientInfoARB
 R034 GLX:CreateContextAttribsARB
+R035 GLX:SetClientInfo2ARB
 R101 GLX:NewList
 R102 GLX:EndList
 R103 GLX:DeleteLists