Merge branch 'raw-events' into next
authorPeter Hutterer <peter.hutterer@who-t.net>
Thu, 29 Sep 2011 04:18:35 +0000 (14:18 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Thu, 29 Sep 2011 04:18:35 +0000 (14:18 +1000)
commit057cc92ebfeebe81b7d01ff2c6aa2c066c8d1a64
tree9d2d821c8b9c011c35b440552c34246c7822fea7
parentafb1fe695d197187a301c19863a128a65389b15c
parent52c9b59a9fed6abfeca775a7a04133cee18eac0b
Merge branch 'raw-events' into next

Conflicts:
configure.ac
dix/events.c
configure.ac
dix/events.c