Peter Hutterer f28eea0647 Merge branch 'master' into mpx ...

Conflicts:

	dix/devices.c
	dix/events.c

2007-04-27 16:34:36 +09:30

..

animcur.c

Allow for multiple animated cursors.

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

filter.c

Fix source picture filter check for multiple screens.

2006-07-03 19:22:26 +02:00

glyph.c

Bug #10560: Code-Cleanup: function declarations () -> (void)

2007-04-09 14:33:15 -07:00

glyphstr.h

Static cleanups, dead code deletion.

2007-03-25 12:27:01 -04:00

Makefile.am

get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE

2006-07-18 18:17:38 -04:00

miglyph.c

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

miindex.c

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

mipict.c

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

mipict.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

mirect.c

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

mitrap.c

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

mitri.c

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

picture.c

Remove #if 0'ed merge leftovers

2007-04-23 14:16:30 -04:00

picture.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

picturestr.h

Gradient fixes

2007-04-23 13:19:54 -04:00

render.c

Multiple integer overflows in dbe and render extensions

2007-01-09 14:14:19 +01:00

renderedge.c

Mark everything in dixsym.c as _X_EXPORT.

2006-02-15 20:44:13 +00:00

renderedge.h

Remove use of dix-config and xorg-config.h from public headers.

2005-08-24 11:18:35 +00:00