diff options
| author | marha <marha@users.sourceforge.net> | 2013-12-22 13:12:15 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-12-22 13:16:58 +0100 |
| commit | 1d03b6f684ab1ea6772f00058605a9ebb2910628 (patch) | |
| tree | 8b393bd59900eba6aa9010cab9e714922cac2536 /libxcb/xcb-proto/src/xinput.xml | |
| parent | 5567cf1befbda64f2dc6fae1d337567cd984b46e (diff) | |
| parent | c81020559f329a516191927222b3698ba7370aca (diff) | |
| download | vcxsrv-1d03b6f684ab1ea6772f00058605a9ebb2910628.tar.gz vcxsrv-1d03b6f684ab1ea6772f00058605a9ebb2910628.tar.bz2 vcxsrv-1d03b6f684ab1ea6772f00058605a9ebb2910628.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxtrans fontconfig glproto libX11 libxcb xcbproto mesa xserver pixman xkeyboard-config git update 22 Dec 2013
Conflicts:
mesalib/include/GL/glext.h
mesalib/src/mesa/drivers/dri/common/dri_util.c
mesalib/src/mesa/drivers/dri/swrast/swrast.c
xorg-server/damageext/damageext.c
xorg-server/dix/dispatch.c
xorg-server/glx/glxdriswrast.c
xorg-server/glx/indirect_dispatch.c
xorg-server/glx/indirect_dispatch_swap.c
xorg-server/glx/indirect_program.c
xorg-server/glx/render2.c
xorg-server/glx/render2swap.c
xorg-server/hw/xwin/glx/gen_gl_wrappers.py
xorg-server/hw/xwin/glx/glthunk.c
xorg-server/hw/xwin/glx/indirect.c
xorg-server/include/os.h
xorg-server/present/present_request.c
Diffstat (limited to 'libxcb/xcb-proto/src/xinput.xml')
| -rw-r--r-- | libxcb/xcb-proto/src/xinput.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libxcb/xcb-proto/src/xinput.xml b/libxcb/xcb-proto/src/xinput.xml index dd3f18438..fa115bdcd 100644 --- a/libxcb/xcb-proto/src/xinput.xml +++ b/libxcb/xcb-proto/src/xinput.xml @@ -1790,10 +1790,10 @@ authorization from the authors. <eventcopy name="DeviceMotionNotify" number="5" ref="DeviceKeyPress" /> <event name="DeviceFocusIn" number="6"> - <field type="BYTE" name="detail" enum="NotifyDetail" /> + <field type="BYTE" name="detail" enum="xproto:NotifyDetail" /> <field type="TIMESTAMP" name="time" /> <field type="WINDOW" name="window" /> - <field type="BYTE" name="mode" enum="NotifyMode" /> + <field type="BYTE" name="mode" enum="xproto:NotifyMode" /> <field type="CARD8" name="device_id" /> <pad bytes="18" /> </event> @@ -2003,8 +2003,8 @@ authorization from the authors. <field type="TIMESTAMP" name="time" altenum="Time" /> <!-- event specific fields --> <field type="DeviceId" name="sourceid" altenum="Device" /> - <field type="CARD8" name="mode" enum="NotifyMode" /> - <field type="CARD8" name="detail" enum="NotifyDetail" /> + <field type="CARD8" name="mode" enum="xinput:NotifyMode" /> + <field type="CARD8" name="detail" enum="xinput:NotifyDetail" /> <field type="WINDOW" name="root" /> <field type="WINDOW" name="event" /> <field type="WINDOW" name="child" /> |