andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6adeba1730
xserver-multidpi/miext
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
..
cw Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
damage Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
rootless Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
shadow devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
Makefile.am merged in miext/rootless changes for XDarwin support 2007-02-16 04:12:26 -08:00