[PULL updated] grab fixes, display name restriction, xephyr grab

[Keith Packard]

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

> Alan Coopersmith (3):
>       If AllocGrab() fails to set up grab, don't copy to a NULL grab
>       GrabDevice() needs to handle NULL return value from AllocGrab()
>       CheckPassiveGrabsOnWindow() needs to handle NULL return value from AllocGrab()
>
> Carlos Garnacho (1):
>       Xi: Ensure DeviceChanged is emitted after grabs are deactivated
>
> Peter Hutterer (2):
>       ephyr: don't allow a shift+ctrl keygrab if mod1 was enabled
>       os: restrict display names to digits

Merged.
   409e8e2..25ebb9d  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/20140122/c8571345/attachment.pgp>