aboutsummaryrefslogtreecommitdiff
path: root/libxcb
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-10-19 12:11:26 +0200
committermarha <marha@users.sourceforge.net>2011-10-19 12:11:26 +0200
commit1e90ede4237374dfbb2c8c506a906233bcfd3c5d (patch)
tree13b59b0ab2715fd0bb9eea788c73b08f3b07c01e /libxcb
parentbaf98f9bb36f956245d83ecd04f90625d6d68d2b (diff)
parent9f986778bd4393c5a9108426969d45aa7f10f334 (diff)
downloadvcxsrv-1e90ede4237374dfbb2c8c506a906233bcfd3c5d.tar.gz
vcxsrv-1e90ede4237374dfbb2c8c506a906233bcfd3c5d.tar.bz2
vcxsrv-1e90ede4237374dfbb2c8c506a906233bcfd3c5d.zip
Merge remote-tracking branch 'origin/released'
Conflicts: xorg-server/include/os.h
Diffstat (limited to 'libxcb')
-rw-r--r--libxcb/xcb-proto/src/xtest.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/libxcb/xcb-proto/src/xtest.xml b/libxcb/xcb-proto/src/xtest.xml
index e481929b7..7f0b2623c 100644
--- a/libxcb/xcb-proto/src/xtest.xml
+++ b/libxcb/xcb-proto/src/xtest.xml
@@ -88,8 +88,8 @@ authorization from the authors.
<field type="CARD32" name="time" />
<field type="WINDOW" name="root" />
<pad bytes="8" />
- <field type="CARD16" name="rootX" />
- <field type="CARD16" name="rootY" />
+ <field type="INT16" name="rootX" />
+ <field type="INT16" name="rootY" />
<pad bytes="7" />
<!-- Version 2.2: XInput device -->
<field type="CARD8" name="deviceid" />