Peter Hutterer 015d728bcd Merge branch 'master' into mpx ...

Conflicts:

	dix/devices.c
	dix/events.c
	mi/misprite.c

2007-03-19 09:42:56 +10:30

..

dri.c

Merge branch 'master' into mpx

2007-03-19 09:42:56 +10:30

dri.h

DRI: New ClipNotify driver hook.

2007-02-20 19:21:25 +01:00

drimodule.c

dri: setup libdrm hooks as early as possible.

2006-11-18 11:29:00 +11:00

dristruct.h

DRI: New ClipNotify driver hook.

2007-02-20 19:21:25 +01:00

Makefile.am

Merge branch 'randr-1.2'

2006-11-27 15:43:15 -08:00

sarea.h

Remove RCS tags. Fix Xprint makefile braindamage.

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

xf86dri.c

Convert callers of SecurityLookupDrawable() to dixLookupDrawable().

2006-12-15 16:51:58 -05:00