[PULL] XWarpPointer revert and XQuartz changes

[Jeremy Huddleston]

The following changes since commit 71594746c7da32e1c7986341a0da30f241a7a2be:

  Merge remote-tracking branch 'whot/for-keith' (2012-02-22 18:07:20 +1300)

are available in the git repository at:


  git://people.freedesktop.org/~jeremyhu/xserver master

for you to fetch changes up to 9d25cd805bc5b7c68bbd62656dc8fabf6c693c87:

  XQuartz: Allow the user to avoid an abort on FatalError (2012-02-22 21:16:50 -0800)

----------------------------------------------------------------
Jeremy Huddleston (5):
      XQuartz: Actually install the new locales
      XQuartz: Short-circuit activateX:
      Revert "dix: don't XWarpPointer through the last slave anymore (#38313)"
      os: Pass the FatalError message to OsVendorFatalError
      XQuartz: Allow the user to avoid an abort on FatalError

 dix/events.c                                       |   21 +++------
 hw/dmx/dmxinit.c                                   |    2 +-
 hw/dmx/dmxlog.c                                    |    3 -
 hw/kdrive/src/kdrive.c                             |    2 +-
 hw/vfb/InitOutput.c                                |    2 +-
 hw/xfree86/common/xf86Init.c                       |    2 +-
 hw/xnest/Init.c                                    |    2 +-
 hw/xquartz/X11Application.h                        |    2 +
 hw/xquartz/X11Application.m                        |   45 ++++++++++++++++++++
 .../Resources/English.lproj/Localizable.strings    |  Bin 4410 -> 5330 bytes
 hw/xquartz/bundle/mk_bundke.sh                     |    2 +-
 hw/xquartz/darwin.c                                |    6 ++-
 hw/xwin/winerror.c                                 |    2 +-
 include/os.h                                       |    2 +-
 os/log.c                                           |   16 ++++---
 test/ddxstubs.c                                    |    2 +-
 16 files changed, 77 insertions(+), 34 deletions(-)