Peter Hutterer 0b729051c0 Merge branch 'master' into mpx ... Conflicts: Xi/extinit.c Xi/grabdev.c Xi/setmode.c Xi/ungrdev.c dix/devices.c dix/events.c dix/getevents.c include/dix.h mi/midispcur.c mi/misprite.c xkb/xkbActions.c xkb/xkbEvents.c xkb/xkbPrKeyEv.c		2007-11-07 15:37:23 +10:30
..
Makefile.am	Remove smashing of CFLAGS from server build.	2006-09-18 12:11:18 -07:00
xf86RAC.c	Merge branch 'master' into mpx	2007-11-07 15:37:23 +10:30
xf86RAC.h	Remove RCS tags. Fix Xprint makefile braindamage.	2006-07-21 17:56:00 -04:00