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. |
||
---|---|---|
.. | ||
dri.c | ||
dri.h | ||
drimodule.c | ||
dristruct.h | ||
Makefile.am | ||
sarea.h | ||
xf86dri.c |