[PULL] more xwayland prep work, restore XkbCopyDeviceKeymap

[Keith Packard]

Peter Hutterer <peter.hutterer at who-t.net> writes:

> 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

Merged.
   e46820f..bda6fdc  master -> master

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 810 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20140325/dcf0d6b2/attachment.sig>