Eamon Walsh a52c9b2a59 Merge branch 'master' into XACE-SELINUX ... Conflicts: dix/dispatch.c dix/property.c hw/xfree86/common/xf86VidMode.c include/xkbsrv.h render/glyph.c xkb/xkbActions.c		2007-11-05 19:08:36 -05:00
..
dgaproc.h	xfree86 input: Re-enable DGA support	2007-03-21 00:12:02 +02:00
Makefile.am	configure.ac/XFree86: Only build XF86Misc and XF86VidMode when appropriate	2007-10-28 15:46:26 +02:00
modinit.c	Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing	2006-06-05 03:00:24 +00:00
modinit.h	xselinux: Started reworking extension using new XACE hooks.	2007-10-17 13:54:56 -04:00
vidmodeproc.h	Remove RCS tags. Fix Xprint makefile braindamage.	2006-07-21 17:56:00 -04:00
xf86dga.c	Remove RCS tags. Fix Xprint makefile braindamage.	2006-07-21 17:56:00 -04:00
xf86dga2.c	registry: Register XF86DGA extension protocol names.	2007-10-15 17:57:59 -04:00
xf86dgaext.h	Death to RCS tags.	2007-06-29 14:06:52 -04:00
xf86misc.c	registry: Register XF86Misc extension protocol names.	2007-10-15 17:37:58 -04:00
xf86miscproc.h	Remove RCS tags. Fix Xprint makefile braindamage.	2006-07-21 17:56:00 -04:00
xf86vmode.c	Merge branch 'master' into XACE-SELINUX	2007-11-05 19:08:36 -05:00
xvmod.c	devPrivates rework: since API is already broken, switch everything	2007-08-28 09:28:25 -04:00
xvmodproc.h	devPrivates rework: since API is already broken, switch everything	2007-08-28 09:28:25 -04:00