frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
xserver/hw/xfree86/utils
History
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
..
cvt Add DIX_CFLAGS to util builds. 2006-11-29 12:02:38 -08:00
gtf Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
ioport Add DIX_CFLAGS to util builds. 2006-11-29 12:02:38 -08:00
kbd_mode Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
xorgcfg Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework 2006-12-08 17:24:15 -08:00
xorgconfig Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2006-11-13 20:32:26 -06:00
Makefile.am Initial batch of changes for PCI rework. All future changes will be 2006-06-07 14:09:02 -07:00