frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
xserver/hw/xfree86/utils
History
Ian Romanick 380b51d605 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 
Conflicts:

	hw/xfree86/common/xf86Init.c
	hw/xfree86/int10/pci.c
	hw/xfree86/scanpci/xf86PciData.h
	hw/xfree86/scanpci/xf86PciStdIds.h
	hw/xfree86/scanpci/xf86PciStr.h
	hw/xfree86/scanpci/xf86ScanPci.h
	hw/xfree86/utils/pcitweak/pcitweak.c
	hw/xfree86/utils/scanpci/scanpci.c

Re-removed most of the conflicting files.
 		2006-07-25 11:30:04 -07:00
..
cvt CVT means Coordinated Video Timing instead of Common. 2006-04-14 23:01:35 +00: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-07-25 11:30:04 -07:00
xorgconfig Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
Makefile.am Initial batch of changes for PCI rework. All future changes will be 2006-06-07 14:09:02 -07:00