Merge remote-tracking branch 'whot/for-keith'
authorKeith Packard <keithp@keithp.com>
Wed, 22 Jan 2014 19:33:53 +0000 (11:33 -0800)
committerKeith Packard <keithp@keithp.com>
Wed, 22 Jan 2014 19:33:53 +0000 (11:33 -0800)
commit25ebb9dbc9df659dec2bf6c27654a5bad2d11f94
tree196d71c9136106382bc74302e4d3f88523812205
parent409e8e29fbe16122ba5a4249256fc56e2e68ea93
parent71baa466b1f6b02fe503f9a3089b7b9d61aa0f80
Merge remote-tracking branch 'whot/for-keith'
Xi/exevents.c
dix/events.c
dix/grabs.c
hw/kdrive/ephyr/ephyr.c
os/utils.c