andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8da83836b6
xserver-multidpi/hw/xfree86
History
Peter Hutterer 8da83836b6 Merge branch 'master' into mpx 
Conflicts:

	XTrap/xtrapddmi.c
	Xext/security.c
	Xext/xprint.c
	Xext/xtest.c
	Xext/xvdisp.c
	Xi/exevents.c
	Xi/grabdevb.c
	Xi/grabdevk.c
	Xi/opendev.c
	Xi/ungrdev.c
	Xi/ungrdevb.c
	Xi/ungrdevk.c
	dix/cursor.c
	dix/devices.c
	dix/dixutils.c
	dix/events.c
	dix/getevents.c
	dix/main.c
	dix/window.c
	hw/xfree86/ramdac/xf86Cursor.c
	include/dix.h
	include/input.h
	include/inputstr.h
	mi/midispcur.c
	mi/miinitext.c
	mi/misprite.c
	render/animcur.c
	xfixes/cursor.c
	xkb/xkbAccessX.c
2008-01-03 17:04:54 +10:30
..
common Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
ddc Death to libcwrapper. 2007-12-03 14:12:58 -05:00
dixmods Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
doc Reference cvt and gtf in the xorg.conf man page. 2007-12-18 19:14:26 -05:00
dri Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
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 mpx 2008-01-03 17:04:54 +10:30
modes Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
os-support Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
parser Use _X_EXPORT instead of __attribute__((visibility("default"))) 2007-12-03 11:31:21 -08:00
rac Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
ramdac Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
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 Initial revision 2003-11-14 16:48:57 +00:00
xorgconf.cpp Remove all traces of external RGB database (and Speedo) 2007-11-05 16:28:35 +00:00