xserver-multidpi/hw/xprint/ps
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 Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
Ps.h Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
PsArc.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
PsArea.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
PsAttr.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
PsAttVal.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
PsCache.c Xprint/ -> hw/xprint 2006-06-18 21:07:28 -04:00
PsColor.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
PsDef.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
PsFonts.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
PsFTFonts.c Xprint/ -> hw/xprint 2006-06-18 21:07:28 -04:00
PsGC.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
PsImageUtil.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
PsInit.c Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
PsLine.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
PsMisc.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
psout_ft.c Xprint: fix handling of TrueType font name 2007-08-27 00:41:03 +10:00
psout_ftpstype1.c Xprint/ -> hw/xprint 2006-06-18 21:07:28 -04:00
psout_ftpstype3.c Xprint/ -> hw/xprint 2006-06-18 21:07:28 -04:00
psout.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
psout.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
PsPixel.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
PsPixmap.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
PsPolygon.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
PsPrint.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
PsSpans.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
PsText.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
PsWindow.c Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
ttf2pt1wrap.c Xprint/ -> hw/xprint 2006-06-18 21:07:28 -04:00