[PULL] XQuartz changes which have been pending, rebased against indent

Jeremy Huddleston jeremyhu at apple.com
Fri Mar 23 19:05:54 PDT 2012


The following changes since commit a7eac500e652f30deffd9dc5e623fab701077738:

  Merge branch 'per-device-sync-counters' into for-keith (2012-03-22 13:13:07 +1000)

are available in the git repository at:


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

for you to fetch changes up to 3e65135fe7b0976703e4f0b512ff842bb80a08b2:

  XQuartz: Detect FatalErrors on startup to prevent tight crash loops (2012-03-23 19:04:45 -0700)

----------------------------------------------------------------
Jeremy Huddleston (6):
      XQuartz: Move our logs into an X11 subdirectory
      XQuartz: Xi: darwinPointer is now Relative
      XQuartz: Use doubles for input valuators
      XQuartz: Add a defaults option to disable the RENDER extension
      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                        |    4 +
 hw/xquartz/X11Application.m                        |   49 +++++++++
 .../Resources/English.lproj/Localizable.strings    |  Bin 4410 -> 5454 bytes
 hw/xquartz/darwin.c                                |   22 ++--
 hw/xquartz/darwinEvents.c                          |  115 +++++++++-----------
 hw/xquartz/darwinEvents.h                          |   16 +--
 hw/xwin/winerror.c                                 |    2 +-
 include/os.h                                       |    2 +-
 os/log.c                                           |   18 +--
 test/ddxstubs.c                                    |    2 +-
 16 files changed, 146 insertions(+), 97 deletions(-)



More information about the xorg-devel mailing list