diff options
author | marha <marha@users.sourceforge.net> | 2014-08-11 21:22:25 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-08-11 21:22:25 +0200 |
commit | 8e27619ab489dece35cc4bec86950ee7729cd309 (patch) | |
tree | ab59dbc661e00c12ed4777cf9d0d37393c4163aa /libxcb/xcb-proto/src/xinput.xml | |
parent | ffc99ce2402fe5c9a6eb8fcf193e8e9472fd993b (diff) | |
parent | fdbedba4d50e1b28b0249c83ba11c029f096e400 (diff) | |
download | vcxsrv-8e27619ab489dece35cc4bec86950ee7729cd309.tar.gz vcxsrv-8e27619ab489dece35cc4bec86950ee7729cd309.tar.bz2 vcxsrv-8e27619ab489dece35cc4bec86950ee7729cd309.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
libxcb/src/c_client.py
mesalib/include/GL/glext.h
mesalib/include/GL/glxext.h
mesalib/src/glsl/.gitignore
mesalib/src/mesa/drivers/dri/common/xmlconfig.h
mesalib/src/mesa/main/.gitignore
xorg-server/Xext/xvmain.c
xorg-server/dix/dispatch.c
xorg-server/hw/xfree86/common/compiler.h
Diffstat (limited to 'libxcb/xcb-proto/src/xinput.xml')
-rw-r--r-- | libxcb/xcb-proto/src/xinput.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libxcb/xcb-proto/src/xinput.xml b/libxcb/xcb-proto/src/xinput.xml index 924c003c7..86350dea0 100644 --- a/libxcb/xcb-proto/src/xinput.xml +++ b/libxcb/xcb-proto/src/xinput.xml @@ -914,6 +914,7 @@ authorization from the authors. <field type="CARD16" name="len" /> <field type="CARD8" name="first_valuator" /> <field type="CARD8" name="num_valuators" /> + <pad bytes="2" /> <list type="CARD32" name="resolution_values"> <fieldref>num_valuators</fieldref> </list> @@ -1229,6 +1230,7 @@ authorization from the authors. <request name="XIChangeHierarchy" opcode="43"> <field type="CARD8" name="num_changes" /> + <pad bytes="3" /> <list type="HierarchyChange" name="changes"> <fieldref>num_changes</fieldref> </list> |