xserver/hw/darwin/quartz/xpr
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
..
Xplugin.h Death to RCS tags. 2007-06-29 14:06:52 -04:00
appledri.c registry: Register APPLEDRI extension protocol names. 2007-10-15 15:45:12 -04:00
appledri.h Death to RCS tags. 2007-06-29 14:06:52 -04:00
appledristr.h Death to RCS tags. 2007-06-29 14:06:52 -04:00
dri.c Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
dri.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
dristruct.h devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
x-hash.c XDarwin: mass change from using xorg-config.h to dix-config.h cuz we're not using the X.org ddx anymore 2007-09-19 05:58:22 -07:00
x-hash.h Death to RCS tags. 2007-06-29 14:06:52 -04:00
x-hook.c XDarwin: mass change from using xorg-config.h to dix-config.h cuz we're not using the X.org ddx anymore 2007-09-19 05:58:22 -07:00
x-hook.h Death to RCS tags. 2007-06-29 14:06:52 -04:00
x-list.c XDarwin: mass change from using xorg-config.h to dix-config.h cuz we're not using the X.org ddx anymore 2007-09-19 05:58:22 -07:00
x-list.h Death to RCS tags. 2007-06-29 14:06:52 -04:00
xpr.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
xprAppleWM.c XDarwin: mass change from using xorg-config.h to dix-config.h cuz we're not using the X.org ddx anymore 2007-09-19 05:58:22 -07:00
xprCursor.c Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
xprFrame.c Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
xprScreen.c pulling more patches over from xorg-xserver-1.2-apple branch 2007-11-05 05:45:21 -08:00