[PULL] Misc XQuartz fixes

[Jeremy Huddleston]

The following changes since commit d7c98c1c81ae272f66edb05fde20f4c616604add:
  Keith Packard (1):
        Merge remote branch 'whot/for-keith'

are available in the git repository at:

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

Jeremy Huddleston (4):
      XQuartz: Blacklist some oddball legacy Mac keycodes that break wine
      XQuartz: Add a defaults option to toggle Alt / Mode_switch
      XQuartz: Customize the NSDefaults id in the man file.
      XQuartz: Add a GUI preference for the Alt / Mode_switch toggle

 hw/xquartz/X11Application.h                        |    1 +
 hw/xquartz/X11Application.m                        |   19 +-
 hw/xquartz/X11Controller.h                         |    6 +-
 hw/xquartz/X11Controller.m                         |  102 +-
 .../English.lproj/main.nib/designable.nib          | 1791 ++++++++------------
 .../English.lproj/main.nib/keyedobjects.nib        |  Bin 41440 -> 45258 bytes
 hw/xquartz/doc/Makefile.am                         |    2 +
 hw/xquartz/doc/Xquartz.man.pre                     |   39 +-
 hw/xquartz/quartz.c                                |    1 +
 hw/xquartz/quartzCommon.h                          |    1 +
 hw/xquartz/quartzKeyboard.c                        |   91 +-
 hw/xquartz/quartzKeyboard.h                        |   10 +-
 12 files changed, 877 insertions(+), 1186 deletions(-)