380b51d605
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. |
||
---|---|---|
.. | ||
generic.c | ||
helper_exec.c | ||
helper_mem.c | ||
INT10.HOWTO | ||
Makefile.am | ||
stub.c | ||
x86emu.c | ||
xf86int10.c | ||
xf86int10.h | ||
xf86int10module.c | ||
xf86x86emu.c | ||
xf86x86emu.h |