xserver/hw/xfree86/dixmods
Peter Hutterer 8da83836b6 Merge branch 'master' into mpx
Conflicts:

	XTrap/xtrapddmi.c
	Xext/security.c
	Xext/xprint.c
	Xext/xtest.c
	Xext/xvdisp.c
	Xi/exevents.c
	Xi/grabdevb.c
	Xi/grabdevk.c
	Xi/opendev.c
	Xi/ungrdev.c
	Xi/ungrdevb.c
	Xi/ungrdevk.c
	dix/cursor.c
	dix/devices.c
	dix/dixutils.c
	dix/events.c
	dix/getevents.c
	dix/main.c
	dix/window.c
	hw/xfree86/ramdac/xf86Cursor.c
	include/dix.h
	include/input.h
	include/inputstr.h
	mi/midispcur.c
	mi/miinitext.c
	mi/misprite.c
	render/animcur.c
	xfixes/cursor.c
	xkb/xkbAccessX.c
2008-01-03 17:04:54 +10:30
..
extmod Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
GLcoremodule.c Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing 2006-06-05 03:00:24 +00:00
Makefile.am Get rid of the type1 font module. 2007-08-23 11:27:33 +02:00
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
glxmodule.c Change the GLX module to initialize after COMPOSITE. 2007-10-29 18:14:18 -04: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 XKB: Actions: Don't run certain actions on the core keyboard 2007-12-05 19:37:48 +00: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