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/randr.xml | |
| 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/randr.xml')
| -rw-r--r-- | libxcb/xcb-proto/src/randr.xml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libxcb/xcb-proto/src/randr.xml b/libxcb/xcb-proto/src/randr.xml index 1ec3234fb..d9192b216 100644 --- a/libxcb/xcb-proto/src/randr.xml +++ b/libxcb/xcb-proto/src/randr.xml @@ -248,9 +248,9 @@ authorization from the authors. <!-- for GetOutputInfo.connection --> <enum name="Connection"> - <item name="Connected" /> - <item name="Disconnected" /> - <item name="Unknown" /> + <item name="Connected"> <value>0</value> </item> + <item name="Disconnected"> <value>1</value> </item> + <item name="Unknown"> <value>2</value> </item> </enum> <request name="GetOutputInfo" opcode="9"> @@ -752,11 +752,10 @@ authorization from the authors. <field type="BOOL" name="pending" /> <pad bytes="2" /> <reply> - <pad bytes="1" /> <field type="CARD8" name="format" /> <field type="ATOM" name="type" /> <!-- None --> <field type="CARD32" name="bytes_after" /> - <field type="CARD16" name="num_items" /> + <field type="CARD32" name="num_items" /> <pad bytes="12" /> <list type="void" name="data"> <op op="*"> |