[PULL v2] xkb keymap loading

[Keith Packard]

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

> Kristian Høgsberg (3):
>       xkb: factor out xkb loading to LoadXkm
>       xkb: add KeymapOrDefault
>       xkb: add XkbLoadKeymapFromString
>
> Peter Hutterer (2):
>       xkb: constify XkbDDXOpenConfigFile
>       xkb: add a callback to xkbcomp
>
> Rui Matos (2):
>       xkb: Factor out a function to copy a keymap's controls onto another
>       xkb: Repurpose XkbCopyDeviceKeymap to apply a given keymap to a device

Merged.
   d18d3f6..4fb31e4  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/20140319/ad463d39/attachment.sig>