andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
97c150b61b
xserver-multidpi/hw/xfree86
History
Eamon Walsh 97c150b61b Merge branch 'master' into XACE-SELINUX 
Conflicts:

	afb/afbpntwin.c
	afb/afbscrinit.c
	afb/afbwindow.c
	cfb/cfb.h
	cfb/cfballpriv.c
	cfb/cfbscrinit.c
	cfb/cfbwindow.c
	configure.ac
	fb/wfbrename.h
	hw/xfree86/xf4bpp/ppcIO.c
	hw/xfree86/xf4bpp/ppcPntWin.c
	hw/xfree86/xf4bpp/ppcWindow.c
	hw/xfree86/xf8_32bpp/cfbscrinit.c
	mfb/mfb.h
	mfb/mfbpntwin.c
	mfb/mfbscrinit.c
	mfb/mfbwindow.c
	mi/miexpose.c

Note: conflicts caused by devPrivates rework vs. paintwindow changes.
2007-09-19 07:25:55 -04:00
..
common Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
ddc MakeAtom needs length without trailing NUL. sizeof("string") includes NUL. 2007-07-14 12:13:17 -07:00
dixmods devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
doc Add xorg.conf man section about catalogue:<dir> FPE 2007-09-04 17:20:27 -07:00
dri devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04: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-09-19 07:25:55 -04:00
fbdevhw Allow yres_virtual to be greater for some kernel fbdev drivers. 2007-08-30 21:57:41 +01: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-09-19 07:25:55 -04:00
modes devPrivates rework: convert CursorRec and CursorBits over to new interface. 2007-08-30 11:40:39 -04:00
os-support Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
parser Death to RCS tags. 2007-06-29 14:06:52 -04:00
rac Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04: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-09-19 07:25:55 -04:00
utils Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2007-08-23 18:19:17 -07:00
vbe Add VBE PanelID support. 2007-06-27 09:19:28 -04:00
vgahw Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2007-08-23 18:19:17 -07: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-09-19 07:25:55 -04:00
xf1bpp Remove the PaintWindow optimization. 2007-09-13 00:08:53 +00:00
xf4bpp Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04: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-09-19 07:25:55 -04:00
Makefile.am Revert part of 529acb1754 because libtool is smart. 2007-09-04 14:49:49 -07:00
Options Initial revision 2003-11-14 16:48:57 +00:00
xorgconf.cpp remove CID support (bug #5553) 2006-12-06 23:24:23 +02:00