[PULL] XQuartz crash loop avoidance

[Jeremy Huddleston]

The following changes since commit b1be72c5ca6cb98ba64637990b142be0f1710a19:

  Version bumped to 1.12 (2012-03-04 20:26:18 -0800)

are available in the git repository at:

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

for you to fetch changes up to 24922b6b20908b9fb366a96ae9d24770e5d0077c:

  XQuartz: Detect FatalErrors on startup to prevent tight crash loops (2012-03-04 23:47:59 -0800)

----------------------------------------------------------------
Jeremy Huddleston (2):
      os: Pass the FatalError message to OsVendorFatalError
      XQuartz: Detect FatalErrors on startup to prevent tight crash loops

 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                        |   43 ++++++++++++++++++++
 .../Resources/English.lproj/Localizable.strings    |  Bin 4410 -> 5454 bytes
 hw/xquartz/darwin.c                                |    6 ++-
 hw/xwin/winerror.c                                 |    2 +-
 include/os.h                                       |    2 +-
 os/log.c                                           |   16 +++++---
 test/ddxstubs.c                                    |    2 +-
 14 files changed, 67 insertions(+), 19 deletions(-)