diff options
| author | marha <marha@users.sourceforge.net> | 2014-08-30 13:45:43 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-08-30 13:45:43 +0200 |
| commit | 3293021e6f582c7348667e7638941620134525e1 (patch) | |
| tree | 5d8d3da8242ff7828fb6964bed19b13d74d48704 /libxcb/xcb-proto/src/xcb.xsd | |
| parent | 0a9ab140bb01b96888e313466a73e26e5156f22d (diff) | |
| parent | e21655632e3fd40b7f6a5cc3c7f3c379d54557c4 (diff) | |
| download | vcxsrv-3293021e6f582c7348667e7638941620134525e1.tar.gz vcxsrv-3293021e6f582c7348667e7638941620134525e1.tar.bz2 vcxsrv-3293021e6f582c7348667e7638941620134525e1.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/kdrive/ephyr/ephyrinit.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 59bb9a883..85f5bc2af 100644 --- a/libxcb/xcb-proto/src/xcb.xsd +++ b/libxcb/xcb-proto/src/xcb.xsd @@ -54,6 +54,7 @@ authorization from the authors. <xsd:attribute name="enum" type="xsd:string" use="optional" /> <xsd:attribute name="altenum" type="xsd:string" use="optional" /> <xsd:attribute name="mask" type="xsd:string" use="optional" /> + <xsd:attribute name="altmask" type="xsd:string" use="optional" /> </xsd:complexType> <!-- case expression --> @@ -77,7 +78,9 @@ authorization from the authors. <xsd:group ref="expression" minOccurs="1" maxOccurs="1" /> <xsd:choice> <!-- bitcase expression - bit test --> - <xsd:element name="bitcase" type="caseexpr" minOccurs="1" maxOccurs="unbounded" /> + <xsd:element name="bitcase" type="caseexpr" minOccurs="0" maxOccurs="unbounded" /> + <!-- case expression - value test --> + <xsd:element name="case" type="caseexpr" minOccurs="0" maxOccurs="unbounded" /> </xsd:choice> <!-- default: --> <xsd:group ref="fields" minOccurs="0" maxOccurs="1" /> |