Peter Hutterer 0b729051c0 Merge branch 'master' into mpx ...

Conflicts:

	Xi/extinit.c
	Xi/grabdev.c
	Xi/setmode.c
	Xi/ungrdev.c
	dix/devices.c
	dix/events.c
	dix/getevents.c
	include/dix.h
	mi/midispcur.c
	mi/misprite.c
	xkb/xkbActions.c
	xkb/xkbEvents.c
	xkb/xkbPrKeyEv.c

2007-11-07 15:37:23 +10:30

..

animcur.c

Allow for multiple animated cursors.

2007-04-04 17:38:10 +09:30

filter.c

Death to RCS tags.

2007-06-29 14:06:52 -04:00

glyph.c

Add CreatePixmap allocation hints.

2007-11-04 16:11:28 -08:00

glyphstr.h

Create a Picture as well as a Pixmap at the time of AllocateGlyph

2007-08-02 22:49:56 -07: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

Add CreatePixmap allocation hints.

2007-11-04 16:11:28 -08: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

Replace calls to Glyphs screen hook with CompositeGlyphs and remove dead code.

2007-10-19 16:34:54 -07:00

picture.h

Superfluous ','.

2007-10-23 16:23:28 +02:00

picturestr.h

Replace calls to Glyphs screen hook with CompositeGlyphs and remove dead code.

2007-10-19 16:34:54 -07:00

render.c

Render: Remove usage of alloca

2007-11-05 14:34:41 +00: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