andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
380b51d605
xserver-multidpi/hw
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
..
darwin Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
dmx Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
kdrive Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
vfb Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
xfree86 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-07-25 11:30:04 -07:00
xgl get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE 2006-07-18 18:17:38 -04:00
xnest Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
xprint Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
xwin Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
Makefile.am Xprint/ -> hw/xprint 2006-06-18 21:07:28 -04:00