xserver-multidpi/hw/xfree86/xf8_32bpp
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
..
cfb8_32.h Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
cfb8_32module.c Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing 2006-06-05 03:00:24 +00:00
cfbcpyarea.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
cfbcpyplane.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
cfbgc.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
cfbgcmisc.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
cfbgcunder.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
cfbimage.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
cfbpntwin.c Remove the PaintWindow optimization. 2007-09-13 00:08:53 +00:00
cfbscrinit.c Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
cfbwindow.c Remove the PaintWindow optimization. 2007-09-13 00:08:53 +00:00
Makefile.am Implement core protocol backing store exclusively in terms of Composite. 2007-08-25 15:08:20 -04:00
xf86overlay.c Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00