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
..
Makefile.am	Remove smashing of CFLAGS from server build.	2006-09-18 12:11:18 -07:00
vgaCmap.c	Remove RCS tags. Fix Xprint makefile braindamage.	2006-07-21 17:56:00 -04:00
vgaHW.c	Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework	2006-07-25 11:30:04 -07:00
vgaHW.h	xfree86: don't do legacy IO on ARM or S/390 (Debian #362641)	2006-08-12 20:43:25 +03:00
vgaHWmodule.c	Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing	2006-06-05 03:00:24 +00:00