[PULL] more xwayland prep work, restore XkbCopyDeviceKeymap

[Peter Hutterer]

The following changes since commit 0e531fbb97868b9a869044fc5a4f6cb58de6751e:

  xkb: add XkbLoadKeymapFromString (2014-03-19 08:37:15 +1000)

are available in the git repository at:

  git://people.freedesktop.org/~whot/xserver for-keith

for you to fetch changes up to 78167a98a8631ee3fad145ddc051ceb8487b9683:

  xkb: Restore XkbCopyDeviceKeymap (2014-03-25 08:50:35 +1000)

----------------------------------------------------------------
Adam Jackson (1):
      xkb: Restore XkbCopyDeviceKeymap

Kristian Høgsberg (4):
      test: Don't add TEST_LDADD to list test
      os: Always compile ListenOnOpenFD() and export it
      os: Add a mechanism to prevent creating any listen sockets
      os: Add AddClientOnOpenFD() to create a new client for an file descriptor

 include/opaque.h |  1 +
 include/os.h     |  6 +++---
 include/xkbsrv.h |  3 +++
 os/connection.c  | 41 +++++++++++++++++++++++++++++++++++------
 os/utils.c       |  4 ++--
 test/Makefile.am |  1 -
 xkb/xkbUtils.c   |  6 ++++++
 7 files changed, 50 insertions(+), 12 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20140325/5b17025f/attachment-0001.sig>