frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
xserver/hw/xfree86/int10
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
..
INT10.HOWTO Merging XORG-CURRENT into trunk 2004-04-23 19:54:30 +00:00
Makefile.am Make the various implementations of xf86ExtendedInitInt10 use the 2006-07-21 16:47:45 -07:00
generic.c Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-07-25 11:30:04 -07:00
helper_exec.c Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-07-25 11:30:04 -07:00
helper_mem.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
stub.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
x86emu.c Remove libcwrapper usage from xorg server modules. The libcwrapper is only 2006-02-10 22:00:30 +00:00
xf86int10.c Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-07-25 11:30:04 -07:00
xf86int10.h Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-07-25 11:30:04 -07:00
xf86int10module.c Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing 2006-06-05 03:00:24 +00:00
xf86x86emu.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
xf86x86emu.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00