Peter Hutterer 99d28c3ef3 Merge branch 'master' into mpx ...

Conflicts:

	Xext/xprint.c (removed in master)
	config/hal.c
	dix/main.c
	hw/kdrive/ati/ati_cursor.c (removed in master)
	hw/kdrive/i810/i810_cursor.c (removed in master)
	hw/xprint/ddxInit.c (removed in master)
	xkb/ddxLoad.c

2008-05-20 10:20:14 +09:30

..

animcur.c

render: don't dereference cursor if cursor is NULL.

2008-05-13 11:17:02 +09:30

filter.c

Death to RCS tags.

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

glyph.c

Allow using libmd instead of libcrypto for SHA1 hashing in render/glyph.c

2008-05-06 17:06:34 -07: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

Bug #10463: Always initialize reference pixel before AllocColor()

2008-02-29 16:39:29 -05: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