[PULL] input fixes, XIQueryVersion fix

[Peter Hutterer]

The following changes since commit 21ea7ebb6a1ad56f3060747af0df235ca6ff27fa:

  dix: scale y back instead of x up when pre-scaling coordinates (2013-07-22 14:18:30 +1000)

are available in the git repository at:

  git://people.freedesktop.org/~whot/xserver for-keith

for you to fetch changes up to 4360514d1cc8e3132f93f56172d291074e8c770f:

  Xi: Allow clients to ask for 2.3 and then 2.2 without failing (2013-07-26 10:39:08 +1000)

----------------------------------------------------------------
Keith Packard (1):
      Xi: Allow clients to ask for 2.3 and then 2.2 without failing

Peter Hutterer (2):
      dix: check the xi2mask, not the grab type for touch listeners
      dix: set the valuator mask to ensure XI 1.x events have data

 Xi/xiqueryversion.c | 36 ++++++++++++++++++++++++++++++------
 dix/getevents.c     |  2 +-
 dix/touch.c         |  3 +--
 include/inputstr.h  |  2 +-
 4 files changed, 33 insertions(+), 10 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20130726/ec06d4fd/attachment.pgp>