xserver/hw/xfree86/dixmods
Eamon Walsh c8feb73f58 Merge branch 'master' into XACE-SELINUX
Conflicts:

	Xext/EVI.c
	Xext/bigreq.c
	Xext/cup.c
	Xext/dpms.c
	Xext/fontcache.c
	Xext/mitmisc.c
	Xext/xcmisc.c
	Xext/xf86bigfont.c
	Xext/xtest.c
	configure.ac
	dbe/dbe.c
	hw/darwin/darwin.h
	hw/darwin/darwinEvents.c
	hw/darwin/iokit/xfIOKit.h
	hw/darwin/iokit/xfIOKitCursor.c
	hw/darwin/quartz/fullscreen/fullscreen.c
	hw/darwin/quartz/fullscreen/quartzCursor.c
	hw/darwin/quartz/quartz.c
	hw/darwin/quartz/quartzCommon.h
	hw/darwin/quartz/quartzCursor.c
	hw/darwin/quartz/xpr/dri.c
	hw/darwin/quartz/xpr/dristruct.h
	hw/darwin/quartz/xpr/xprCursor.c
	hw/darwin/quartz/xpr/xprFrame.c
	hw/xfree86/modes/xf86RandR12.c
	include/cursor.h
	miext/rootless/rootlessCommon.h
	miext/rootless/rootlessScreen.c
	miext/rootless/rootlessWindow.c
	render/picturestr.h

Trying to pick up the pieces from the darwin churn here...
2007-12-13 18:38:25 -05:00
..
extmod Revert "registry: Register XF86VidMode extension protocol names." 2007-11-20 17:47:30 -05:00
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