[PULL] slowkeys warning, BUG_RETURN macros

[Peter Hutterer]

The following changes since commit 42ae2e8199fe875319978249963de7499607988b:

  xkb: Allocate size_syms correctly when width of a type increases (2012-06-04 11:28:44 +1000)

are available in the git repository at:

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

for you to fetch changes up to d034605f3914e41e0d636eafff9278be1c041b2c:

  dix: rename shadowing loop variable in TouchResizeQueue (2012-06-07 13:31:41 +1000)

----------------------------------------------------------------
Chase Douglas (1):
      test/touch: Initialize device name

Peter Hutterer (6):
      xkb: warn if XKB SlowKeys have been automatically enabled
      include: add BUG_RETURN_* macros
      Replace a few BUG_WARN with BUG_RETURN_VAL
      dix: use BUG_RETURN_VAL for pairing errors
      dix: change "still paired warning" to use BUG_RETURN_VAL
      dix: rename shadowing loop variable in TouchResizeQueue

 Xi/exevents.c    |   25 ++++++++++---------------
 dix/devices.c    |   21 ++++++++-------------
 dix/getevents.c  |    5 +----
 dix/touch.c      |   23 +++++++++--------------
 include/misc.h   |   12 ++++++++++++
 test/touch.c     |    5 +++++
 xkb/xkbAccessX.c |    9 +++++++--
 7 files changed, 52 insertions(+), 48 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/20120607/bd1139e6/attachment.pgp>