Peter Hutterer f367285fd5 Merge branch 'master' into mpx ... Conflicts: Xi/exevents.c dix/devices.c dix/getevents.c include/dix.h mi/mieq.c		2007-08-12 15:31:10 +09:30
..
Makefile.am	get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE	2006-07-18 18:17:38 -04:00
record.c	dix: Moving SpriteRec into DeviceIntRec	2006-12-11 18:09:59 +10:30
set.c	General DIX static and dead code cleanup.	2007-03-25 17:57:54 -04:00
set.h	Death to RCS tags.	2007-06-29 14:06:52 -04:00