diff options
author | marha <marha@users.sourceforge.net> | 2012-01-11 09:10:24 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-01-11 09:10:24 +0100 |
commit | cc96d00cae473f472e371328ce8dc572ad258073 (patch) | |
tree | cc81c0c8bc15f6f8931b69db44fda8355835bd1b | |
parent | a73c45b7c72c6e426e1c75dd939f5481227b6979 (diff) | |
parent | 39324211d7a79ef8115fd1e39771a2e400b31993 (diff) | |
download | vcxsrv-cc96d00cae473f472e371328ce8dc572ad258073.tar.gz vcxsrv-cc96d00cae473f472e371328ce8dc572ad258073.tar.bz2 vcxsrv-cc96d00cae473f472e371328ce8dc572ad258073.zip |
Merge remote-tracking branch 'origin/released'
-rw-r--r-- | X11/extensions/XI2.h | 1 | ||||
-rw-r--r-- | packages.txt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/X11/extensions/XI2.h b/X11/extensions/XI2.h index 436800623..e864b0635 100644 --- a/X11/extensions/XI2.h +++ b/X11/extensions/XI2.h @@ -158,6 +158,7 @@ #define XIPointerEmulated (1 << 16) /* Device event flags (touch events only) */ #define XITouchPendingEnd (1 << 16) +#define XITouchEmulatingPointer (1 << 17) /* Touch modes */ #define XIDirectTouch 1 diff --git a/packages.txt b/packages.txt index 40851e1d5..041baceea 100644 --- a/packages.txt +++ b/packages.txt @@ -46,7 +46,7 @@ fontconfig git version fontsproto-2.1.1
freetype-2.4.8
glproto git version
-inputproto-2.1.99.4
+inputproto-2.1.99.5
kbproto-1.0.5
libX11 git version
libXau git version
|