xserver-multidpi/Xext
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
..
appgroup.c Revert "registry: Register APPGROUP extension protocol names." 2007-11-20 17:59:40 -05:00
appgroup.h Static and dead code cleaup for Xext/ 2007-03-25 17:57:22 -04:00
bigreq.c Clean up many #if 0. 2007-12-02 12:40:25 -05:00
cup.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
dpms.c Clean up many #if 0. 2007-12-02 12:40:25 -05:00
dpmsproc.h xace: add hooks + new access codes: core protocol screensaver requests 2007-08-16 10:36:05 -04:00
dpmsstubs.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
EVI.c Clean up many #if 0. 2007-12-02 12:40:25 -05:00
EVIstruct.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
fontcache.c Clean up many #if 0. 2007-12-02 12:40:25 -05:00
Makefile.am Remove SecurityPolicy file and associated references in the manpages. 2007-11-08 16:46:31 -05:00
mbuf.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
mbufbf.c Xext: Remove usage of alloca 2007-11-05 14:34:46 +00:00
mbufpx.c Xext: Remove usage of alloca 2007-11-05 14:34:46 +00:00
mitmisc.c Clean up many #if 0. 2007-12-02 12:40:25 -05:00
panoramiX.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
panoramiX.h Death to RCS tags. 2007-06-29 14:06:52 -04:00
panoramiXh.h Static and dead code cleaup for Xext/ 2007-03-25 17:57:22 -04:00
panoramiXprocs.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
panoramiXsrv.h Static and dead code cleaup for Xext/ 2007-03-25 17:57:22 -04:00
panoramiXSwap.c Add missing swaps in panoramiXSwap.c 2007-12-05 18:29:54 +00:00
sampleEVI.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
saver.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
security.c registry: Remove registry code from XC-SECURITY extension. 2007-11-20 18:21:09 -05:00
securitysrv.h Rework of the XC-SECURITY extension. The gen-auth protocol has not changed, 2007-11-08 16:32:42 -05:00
shape.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
shm.c Revert "registry: Register SHM extension protocol names." 2007-11-20 18:23:57 -05:00
shmint.h Export fbShmPutImage to modules. 2007-08-24 14:02:35 +02:00
sleepuntil.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
sleepuntil.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
sync.c Revert "registry: Register SYNC extension protocol names." 2007-11-20 18:25:15 -05:00
xace.c Merge branch 'master' into XACE-SELINUX 2007-11-14 13:35:50 -05:00
xace.h Merge branch 'master' into XACE-SELINUX 2007-11-14 13:35:50 -05:00
xacestr.h xace: Still more changes to selection code. Removed the SelectionPtr from 2007-10-23 17:12:57 -04:00
xcalibrate.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
xcmisc.c Clean up many #if 0. 2007-12-02 12:40:25 -05:00
xevie.c Revert "registry: Register EVIE extension protocol names." 2007-11-20 18:34:14 -05:00
xf86bigfont.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
xprint.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
xres.c registry: Fix some mistakes in the reversion of prior commits. 2007-11-20 18:58:55 -05:00
xselinux.c xselinux: Add new protocol for setting device create context. 2007-12-12 20:44:59 -05:00
xselinux.h xselinux: Add new protocol for setting device create context. 2007-12-12 20:44:59 -05:00
xtest.c Clean up many #if 0. 2007-12-02 12:40:25 -05:00
xvdisp.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
xvdisp.h Fix swapped Xv dispatch under Xinerama. 2007-12-02 14:15:36 -05:00
xvdix.h devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
xvmain.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
xvmc.c Revert "registry: Register XvMC extension protocol names." 2007-11-20 18:43:38 -05:00
xvmcext.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00