Ian Romanick da09964a93 Merge branch 'origin' into pci-rework ... Conflicts: hw/xfree86/int10/generic.c		2007-01-09 15:27:34 -08:00
..
dri.c	Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework	2006-12-08 17:24:15 -08:00
dri.h	Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework	2006-12-08 17:24:15 -08:00
drimodule.c	dri: setup libdrm hooks as early as possible.	2006-11-18 11:29:00 +11:00
dristruct.h	Remove RCS tags. Fix Xprint makefile braindamage.	2006-07-21 17:56:00 -04: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