Peter Hutterer 8da83836b6 Merge branch 'master' into mpx ...

Conflicts:

	XTrap/xtrapddmi.c
	Xext/security.c
	Xext/xprint.c
	Xext/xtest.c
	Xext/xvdisp.c
	Xi/exevents.c
	Xi/grabdevb.c
	Xi/grabdevk.c
	Xi/opendev.c
	Xi/ungrdev.c
	Xi/ungrdevb.c
	Xi/ungrdevk.c
	dix/cursor.c
	dix/devices.c
	dix/dixutils.c
	dix/events.c
	dix/getevents.c
	dix/main.c
	dix/window.c
	hw/xfree86/ramdac/xf86Cursor.c
	include/dix.h
	include/input.h
	include/inputstr.h
	mi/midispcur.c
	mi/miinitext.c
	mi/misprite.c
	render/animcur.c
	xfixes/cursor.c
	xkb/xkbAccessX.c

2008-01-03 17:04:54 +10:30

..

animcur.c

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

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