xserver-multidpi/hw/xprint/pcl
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
..
Makefile.am Xprint/ -> hw/xprint 2006-06-18 21:07:28 -04:00
Makefile.am.inc Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
Pcl.h Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
PclArc.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
PclArea.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
PclAttr.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
PclAttVal.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
PclColor.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
PclCursor.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
PclDef.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
PclFonts.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
PclGC.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
PclInit.c Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
PclLine.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
Pclmap.h Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
PclMisc.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
PclPixel.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
PclPolygon.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
PclPrint.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
PclSFonts.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
PclSFonts.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
PclSpans.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
PclText.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
PclWindow.c Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00