xserver-multidpi/render
Eamon Walsh c8feb73f58 Merge branch 'master' into XACE-SELINUX
Conflicts:

	Xext/EVI.c
	Xext/bigreq.c
	Xext/cup.c
	Xext/dpms.c
	Xext/fontcache.c
	Xext/mitmisc.c
	Xext/xcmisc.c
	Xext/xf86bigfont.c
	Xext/xtest.c
	configure.ac
	dbe/dbe.c
	hw/darwin/darwin.h
	hw/darwin/darwinEvents.c
	hw/darwin/iokit/xfIOKit.h
	hw/darwin/iokit/xfIOKitCursor.c
	hw/darwin/quartz/fullscreen/fullscreen.c
	hw/darwin/quartz/fullscreen/quartzCursor.c
	hw/darwin/quartz/quartz.c
	hw/darwin/quartz/quartzCommon.h
	hw/darwin/quartz/quartzCursor.c
	hw/darwin/quartz/xpr/dri.c
	hw/darwin/quartz/xpr/dristruct.h
	hw/darwin/quartz/xpr/xprCursor.c
	hw/darwin/quartz/xpr/xprFrame.c
	hw/xfree86/modes/xf86RandR12.c
	include/cursor.h
	miext/rootless/rootlessCommon.h
	miext/rootless/rootlessScreen.c
	miext/rootless/rootlessWindow.c
	render/picturestr.h

Trying to pick up the pieces from the darwin churn here...
2007-12-13 18:38:25 -05:00
..
animcur.c xace: add new fields to resource access hook to allow parent resource objects 2007-09-05 11:18:36 -04:00
filter.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
glyph.c Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
glyphstr.h Merge branch 'master' into XACE-SELINUX 2007-10-25 12:19:30 -04:00
Makefile.am Replace calls to Glyphs screen hook with CompositeGlyphs and remove dead code. 2007-10-19 16:34:54 -07:00
miindex.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
mipict.c Restore the CompositeGlyphs -> ps->Glyphs -> miGlyphs callchain to allow acceleration architectures to wrap above miGlyphs. 2007-10-26 15:14:03 -07:00
mipict.h Replace calls to Glyphs screen hook with CompositeGlyphs and remove dead code. 2007-10-19 16:34:54 -07:00
mirect.c Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
mitrap.c Add CreatePixmap allocation hints. 2007-11-04 16:11:28 -08:00
mitri.c Render: Remove usage of alloca 2007-11-05 14:34:41 +00:00
picture.c Merge branch 'master' into XACE-SELINUX 2007-10-25 12:19:30 -04:00
picture.h Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
picturestr.h Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
render.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
renderedge.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
renderedge.h Death to RCS tags. 2007-06-29 14:06:52 -04:00