andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
c8feb73f58
xserver-multidpi/hw/xfree86
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
..
common Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
ddc Death to libcwrapper. 2007-12-03 14:12:58 -05:00
dixmods Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
doc Remove all traces of external RGB database (and Speedo) 2007-11-05 16:28:35 +00:00
dri Revert "registry: Register XF86DRI extension protocol names." 2007-11-20 17:48:46 -05:00
dummylib Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2007-08-23 18:19:17 -07:00
exa Merge branch 'master' into XACE-SELINUX 2007-11-14 13:35:50 -05:00
fbdevhw Fix magic number in fbdevhw 2007-11-02 12:05:41 -04:00
i2c Fixing xf86I2CGetScreenBuses(), now dereferencing the correct pointer. 2007-09-04 16:42:57 +02:00
int10 Fixing a misleading comment which could suggest a GPL violation. 2007-08-30 14:28:06 +02:00
loader Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
modes Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
os-support Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
parser Use _X_EXPORT instead of __attribute__((visibility("default"))) 2007-12-03 11:31:21 -08:00
rac Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
ramdac devPrivates rework: convert CursorRec and CursorBits over to new interface. 2007-08-30 11:40:39 -04:00
shadowfb Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
utils Death to libcwrapper. 2007-12-03 14:12:58 -05:00
vbe Don't filter modes away during VBE mode list construction. 2007-11-02 12:05:58 -04:00
vgahw XFree86: Remove usage of alloca 2007-11-05 14:34:42 +00:00
x86emu Make x86emu's I/O cycle tracing more useful. 2007-07-02 18:41:55 -04:00
xaa Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
xf1bpp Remove the PaintWindow optimization. 2007-09-13 00:08:53 +00:00
xf4bpp Merge branch 'master' into XACE-SELINUX 2007-11-19 18:10:46 -05:00
xf8_16bpp Remove smashing of CFLAGS from server build. 2006-09-18 12:11:18 -07:00
xf8_32bpp Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
Makefile.am Remove all traces of external RGB database (and Speedo) 2007-11-05 16:28:35 +00:00
Options
xorgconf.cpp Remove all traces of external RGB database (and Speedo) 2007-11-05 16:28:35 +00:00