From: Josh Triplett <josh@freedesktop.org>
Date: Sat, 29 Apr 2006 18:00:01 +0000 (-0700)
Subject: Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb
X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ebc4ad4d385f96528da1d26f96f09cf0c7af2a8;hp=a34270694747289ed61c2ebe25e76e78b0363423;p=free-sw%2Fxcb%2Fproto

Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb
---

diff --git a/src/extensions/glx.xml b/src/extensions/glx.xml
index a40ecb2..c890ca8 100644
--- a/src/extensions/glx.xml
+++ b/src/extensions/glx.xml
@@ -248,10 +248,8 @@ The patch that fixed this server bug in X.org CVS is here:
 			<pad bytes="1" />
 			<field type="CARD32" name="num_visuals" />
 			<field type="CARD32" name="num_props" />
-			<pad bytes="16" />
-			<valueparam value-mask-type="CARD32"
-				value-mask-name="value_mask"
-				value-list-name="value_list" />
+                        <pad bytes="16" />
+                        <list type="CARD32" name="property_list" />
 		</reply>
 	</request>
 
@@ -325,10 +323,13 @@ The patch that fixed this server bug in X.org CVS is here:
 			<pad bytes="1" />
 			<field type="CARD32" name="num_FB_configs" />
 			<field type="CARD32" name="num_properties" />
-			<pad bytes="16" />
+                        <pad bytes="16" />
+                        <!--
 			<valueparam value-mask-type="CARD32"
 				value-mask-name="value_mask"
-				value-list-name="value_list" />
+                                value-list-name="value_list" />
+                            -->
+                        <list type="CARD32" name="property_list" />
 		</reply>
 	</request>