diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-16 11:30:08 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-16 11:30:08 +0200 |
| commit | 56e12b1310b1b52d00bc27e919d915255af5bf03 (patch) | |
| tree | 19379a18fe9a678a109397837339820892101e4b /libxcb/xcb-proto/src/xcb.xsd | |
| parent | c5883f8af060c0a300a29e732e8bb893bc8e0eca (diff) | |
| parent | 9e23b44bfe1e6e85231b1c07d945cadf0c868648 (diff) | |
| download | vcxsrv-56e12b1310b1b52d00bc27e919d915255af5bf03.tar.gz vcxsrv-56e12b1310b1b52d00bc27e919d915255af5bf03.tar.bz2 vcxsrv-56e12b1310b1b52d00bc27e919d915255af5bf03.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libxcb libxcb/xcb-proto xserver mesa pixman xkbcomp git update 16 oct 2013
Conflicts:
mesalib/src/mesa/drivers/dri/common/drisw_util.c
pixman/pixman/pixman-mmx.c
Diffstat (limited to 'libxcb/xcb-proto/src/xcb.xsd')
| -rw-r--r-- | libxcb/xcb-proto/src/xcb.xsd | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libxcb/xcb-proto/src/xcb.xsd b/libxcb/xcb-proto/src/xcb.xsd index 819495b95..7a9c80018 100644 --- a/libxcb/xcb-proto/src/xcb.xsd +++ b/libxcb/xcb-proto/src/xcb.xsd @@ -353,7 +353,10 @@ authorization from the authors. <xsd:sequence minOccurs="1" maxOccurs="unbounded"> <xsd:element name="item"> <xsd:complexType> - <xsd:group ref="expression" minOccurs="0" maxOccurs="1" /> + <xsd:choice minOccurs="1" maxOccurs="1"> + <xsd:element name="value" type="dec-or-hex-integer" /> + <xsd:element name="bit" type="xsd:integer" /> + </xsd:choice> <xsd:attribute name="name" type="xsd:string" use="required" /> </xsd:complexType> </xsd:element> |