frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
xserver/Xext
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
..
EVI.c
…
EVIstruct.h
…
Makefile.am
…
appgroup.c
…
appgroup.h
…
bigreq.c
…
cup.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
dpms.c
…
dpmsproc.h
…
dpmsstubs.c
…
fontcache.c
…
mbuf.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
mbufbf.c
…
mbufpx.c
…
mitmisc.c
…
panoramiX.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
panoramiX.h
…
panoramiXSwap.c Add missing swaps in panoramiXSwap.c 2007-12-05 18:29:54 +00:00
panoramiXh.h
…
panoramiXprocs.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
panoramiXsrv.h
…
sampleEVI.c
…
saver.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
security.c
…
securitysrv.h
…
shape.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
shm.c
…
shmint.h
…
sleepuntil.c
…
sleepuntil.h
…
sync.c
…
xace.c
…
xace.h
…
xacestr.h
…
xcalibrate.c
…
xcmisc.c
…
xevie.c
…
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
…
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
…
xvdisp.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
xvdisp.h
…
xvdix.h
…
xvmain.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
xvmc.c
…
xvmcext.h
…