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
..
extmod	Merge branch 'master' into mpx	2007-11-07 15:37:23 +10:30
afbmodule.c	Remove mfb and cfb from include paths where they're not needed.	2007-05-11 11:43:19 -04:00
cfb32module.c	Remove mfb and cfb from include paths where they're not needed.	2007-05-11 11:43:19 -04:00
cfbmodule.c	Remove mfb and cfb from include paths where they're not needed.	2007-05-11 11:43:19 -04:00
dbemodule.c	Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing	2006-06-05 03:00:24 +00:00
fbmodule.c	Build infrastructure for libwfb.so.	2006-07-26 15:48:50 -07:00
ftmodule.c	Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing	2006-06-05 03:00:24 +00:00
GLcoremodule.c	Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing	2006-06-05 03:00:24 +00:00
glxmodule.c	Change the GLX module to initialize after COMPOSITE.	2007-10-29 18:14:18 -04:00
Makefile.am	Get rid of the type1 font module.	2007-08-23 11:27:33 +02:00
mfbmodule.c	Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing	2006-06-05 03:00:24 +00:00
recordmod.c	Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing	2006-06-05 03:00:24 +00:00
shmodule.c	Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing	2006-06-05 03:00:24 +00:00
xf86XTrapModule.c	Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing	2006-06-05 03:00:24 +00:00
xkbKillSrv.c	Static markup and dead code cull over xkb/.	2007-03-20 18:37:02 -04:00
xkbPrivate.c	Static markup and dead code cull over xkb/.	2007-03-20 18:37:02 -04:00
xkbVT.c	Static markup and dead code cull over xkb/.	2007-03-20 18:37:02 -04:00