frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
xserver/hw/xquartz
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
..
bundle Xquartz: Removed Xplugin.h from EXTRA_DIST 2007-12-10 20:34:40 -08:00
xpr Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
Makefile.am Xquartz Added quartzKeyboard.h to EXTRA_DIST 2007-12-08 11:49:55 -08:00
X11Application.h Darwin: Flattened quartz into darwin, renamed darwin xquartz 2007-12-05 20:32:40 -08:00
X11Application.m Darwin: Renamed DarwinModeBlah to QuartzBlah 2007-12-05 21:26:16 -08:00
X11Controller.h Darwin: Flattened quartz into darwin, renamed darwin xquartz 2007-12-05 20:32:40 -08:00
X11Controller.m Darwin: Flattened quartz into darwin, renamed darwin xquartz 2007-12-05 20:32:40 -08:00
applewm.c Darwin: Flattened quartz into darwin, renamed darwin xquartz 2007-12-05 20:32:40 -08:00
applewmExt.h Darwin: Flattened quartz into darwin, renamed darwin xquartz 2007-12-05 20:32:40 -08:00
darwin.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
darwin.h Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
darwinClut8.h Darwin: Flattened quartz into darwin, renamed darwin xquartz 2007-12-05 20:32:40 -08:00
darwinEvents.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
darwinEvents.h Darwin: Renamed DarwinModeBlah to QuartzBlah 2007-12-05 21:26:16 -08:00
darwinKeyboard.c Xquartz: Make Alt work with Xmodmap again 2007-12-10 21:03:30 -08:00
darwinKeyboard.h Darwin: Flattened quartz into darwin, renamed darwin xquartz 2007-12-05 20:32:40 -08:00
darwinXinput.c Darwin: Flattened quartz into darwin, renamed darwin xquartz 2007-12-05 20:32:40 -08:00
keysym2ucs.c Darwin: Flattened quartz into darwin, renamed darwin xquartz 2007-12-05 20:32:40 -08:00
keysym2ucs.h Darwin: Flattened quartz into darwin, renamed darwin xquartz 2007-12-05 20:32:40 -08:00
pseudoramiX.c Darwin: Flattened quartz into darwin, renamed darwin xquartz 2007-12-05 20:32:40 -08:00
pseudoramiX.h Darwin: Flattened quartz into darwin, renamed darwin xquartz 2007-12-05 20:32:40 -08:00
quartz.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
quartz.h Darwin: Renamed DarwinModeBlah to QuartzBlah 2007-12-05 21:26:16 -08:00
quartzAudio.c Darwin: Renamed DarwinModeBlah to QuartzBlah 2007-12-05 21:26:16 -08:00
quartzAudio.h Darwin: Flattened quartz into darwin, renamed darwin xquartz 2007-12-05 20:32:40 -08:00
quartzCocoa.m Darwin: Flattened quartz into darwin, renamed darwin xquartz 2007-12-05 20:32:40 -08:00
quartzCommon.h Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
quartzCursor.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
quartzCursor.h Darwin: Flattened quartz into darwin, renamed darwin xquartz 2007-12-05 20:32:40 -08:00
quartzForeground.c Xquartz: Actually add quartzForeground.[hc] 2007-12-08 01:42:03 -08:00
quartzForeground.h Xquartz: Actually add quartzForeground.[hc] 2007-12-08 01:42:03 -08:00
quartzKeyboard.c Xquartz: Make Alt work with Xmodmap again 2007-12-10 21:03:30 -08:00
quartzKeyboard.h Xquartz: Make Alt work with Xmodmap again 2007-12-10 21:03:30 -08:00
quartzPasteboard.c Darwin: Flattened quartz into darwin, renamed darwin xquartz 2007-12-05 20:32:40 -08:00
quartzPasteboard.h Darwin: Flattened quartz into darwin, renamed darwin xquartz 2007-12-05 20:32:40 -08:00
quartzStartup.c XQuartz: Fixed "Multiple Dock Icons" 2007-12-08 00:35:14 -08:00