Ian Romanick 8b90913566 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework ... Conflicts: hw/xfree86/Makefile.am hw/xfree86/common/xf86.h hw/xfree86/common/xf86DoScanPci.c hw/xfree86/os-support/bus/linuxPci.c hw/xfree86/scanpci/extrapci.ids hw/xfree86/scanpci/pci.ids hw/xfree86/scanpci/pciid2c.pl hw/xfree86/scanpci/xf86PciStdIds.h		2006-10-24 08:57:59 -07:00
..
cvt	Bug #5386 (partial): Move CVT mode generator from cvt(1) to server core, and	2006-07-28 16:02:02 -04:00
gtf	Remove RCS tags. Fix Xprint makefile braindamage.	2006-07-21 17:56:00 -04:00
ioport	Remove RCS tags. Fix Xprint makefile braindamage.	2006-07-21 17:56:00 -04:00
kbd_mode	Remove RCS tags. Fix Xprint makefile braindamage.	2006-07-21 17:56:00 -04:00
xorgcfg	Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework	2006-10-24 08:57:59 -07:00
xorgconfig	Add ast driver/device info to Xorg server & config utilities	2006-10-19 17:30:54 -07:00
Makefile.am	Initial batch of changes for PCI rework. All future changes will be	2006-06-07 14:09:02 -07:00