xserver-multidpi/mfb
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
..
fastblt.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
Makefile.am Remove the PaintWindow optimization. 2007-09-13 00:08:53 +00:00
maskbits.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
maskbits.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
mergerop.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
mfb.h Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
mfbbitblt.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
mfbblt.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
mfbbres.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
mfbbresd.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
mfbclip.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
mfbcmap.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
mfbfillarc.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
mfbfillrct.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
mfbfillsp.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
mfbfont.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
mfbgc.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
mfbgetsp.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
mfbhrzvert.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
mfbimage.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
mfbimggblt.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
mfbline.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
mfbmisc.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
mfbpixmap.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
mfbply1rct.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
mfbplygblt.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
mfbpntarea.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
mfbpolypnt.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
mfbpushpxl.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
mfbscrclse.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
mfbscrinit.c Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
mfbsetsp.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
mfbtegblt.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
mfbtile.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
mfbwindow.c Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
mfbzerarc.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00