[PULL] XQuartz regression fixes and keymapping change

[Jeremy Huddleston]

The following changes since commit f2eacb4646beb25d055de22868f93e6b24f229b6:
  Peter Hutterer (1):
        Revert "dix: Use DeliverGrabbedEvent for implicit passive grabs (#25400)"

are available in the git repository at:

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

Jeremy Huddleston (3):
      XQuartz: GLX: Fix prototype for swapBuffers
      XQuartz: Include os.h for OsAbort()
      XQuartz: Use an empty xkb keymap by default

 hw/xquartz/GL/capabilities.c |    4 ++++
 hw/xquartz/GL/indirect.c     |    2 +-
 hw/xquartz/darwin.c          |    6 ++++++
 hw/xquartz/quartzKeyboard.c  |   16 +++++-----------
 4 files changed, 16 insertions(+), 12 deletions(-)

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 5820 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20100311/ed883c98/attachment.bin>