Peter Hutterer e8777a91f3 Merge branch 'master' into mpx ... Conflicts: Xi/closedev.c Xi/exevents.c Xi/extinit.c Xi/listdev.c dix/window.c hw/xfree86/common/xf86Xinput.c include/extinit.h mi/mipointer.c		2007-04-02 15:36:26 +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	Remove RCS tags. Fix Xprint makefile braindamage.	2006-07-21 17:56:00 -04:00