frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
xserver/hw
History
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
..
dmx Revert "registry: Register DMX extension protocol names." 2007-11-20 17:40:57 -05:00
kdrive Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
vfb Darwin: Use __APPLE__ instead of __DARWIN__ 2007-12-07 18:54:58 -08:00
xfree86 Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
xgl Merge branch 'master' into XACE-SELINUX 2007-11-19 18:10:46 -05:00
xnest Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
xprint Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
xquartz Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
xwin Revert "registry: Register WINDOWSWM extension protocol names." 2007-11-20 17:50:26 -05:00
Makefile.am Darwin: Use __APPLE__ instead of __DARWIN__ 2007-12-07 18:54:58 -08:00