Merge branch 'raw-events' into next

Conflicts:
	configure.ac
	dix/events.c
This commit is contained in:
Peter Hutterer
2011-09-29 14:18:35 +10:00
3 changed files with 78 additions and 18 deletions

View File

@@ -127,7 +127,7 @@
/* X Input */
#define SERVER_XI_MAJOR_VERSION 2
#define SERVER_XI_MINOR_VERSION 0
#define SERVER_XI_MINOR_VERSION 1
/* XKB */
#define SERVER_XKB_MAJOR_VERSION 1