Merge branch 'master' into mpx

Conflicts:

	Xi/exevents.c
	dix/devices.c
	dix/getevents.c
	include/dix.h
	mi/mieq.c
This commit is contained in:
Peter Hutterer 2007-08-12 15:31:10 +09:30
commit f367285fd5
755 changed files with 16266 additions and 5261 deletions

View file

@ -166,7 +166,6 @@ extern Mask xevieFilters[128];
extern int xevieEventSent;
extern int xevieKBEventSent;
int xeviegrabState = 0;
static xEvent *xeviexE;
#endif
#include <X11/extensions/XIproto.h>