Thomas pointed out that the fix for 55738 may cause another bug, but I
suspect it merely uncovers that other bug. So the patch is included here
nonetheless.

The following changes since commit 53830281b4da096f9c13107d73ec9c76ff1d14cc:

  Merge remote-tracking branch 'sandmann/for-keithp' (2012-10-26 18:04:34 -0700)

are available in the git repository at:


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

for you to fetch changes up to d511a3016a79c50cb38e7504d4831a9ae128e422:

  Add missing labels for multitouch valuators (2012-10-30 15:11:10 +1000)

----------------------------------------------------------------
Benjamin Tissoires (1):
      Add missing labels for multitouch valuators

Carlos Garnacho (1):
      Sync TouchListener memory allocation with population in 
TouchSetupListeners()

Peter Hutterer (5):
      xkb: ProcesssPointerEvent must work on the VCP if it gets the VCP
      Xi: set xChangeDeviceControlReply.status to Success by default
      Xi: don't deliver TouchEnd to a client waiting for TouchBegin (#55738)
      dix: fix zaphod screen scrossing (#54654)
      xfree86: remove unused variable sigstate

 Xi/chgdctl.c                   | 3 ++-
 Xi/exevents.c                  | 5 +++++
 Xi/xiproperty.c                | 3 +++
 dix/getevents.c                | 5 +++--
 dix/touch.c                    | 4 ++--
 hw/xfree86/common/xf86Events.c | 2 +-
 include/xserver-properties.h   | 3 +++
 xkb/xkbAccessX.c               | 2 +-
 8 files changed, 20 insertions(+), 7 deletions(-)

Attachment: pgpO2OEAmmzrA.pgp
Description: PGP signature

_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to