Ian Romanick e1f73d2208 Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework ... Conflicts: hw/xfree86/common/xf86Configure.c hw/xfree86/common/xf86Helper.c hw/xfree86/common/xf86pciBus.c hw/xfree86/int10/helper_exec.c hw/xfree86/os-support/bus/Pci.c hw/xfree86/os-support/bus/linuxPci.c hw/xfree86/os-support/linux/lnx_pci.c hw/xfree86/scanpci/Makefile.am hw/xfree86/utils/pcitweak/Makefile.am hw/xfree86/utils/scanpci/Makefile.am		2006-12-08 17:24:15 -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	Remove RCS tags. Fix Xprint makefile braindamage.	2006-07-21 17:56:00 -04:00