Conflicts: hw/xfree86/Makefile.am hw/xfree86/common/xf86.h hw/xfree86/common/xf86DoScanPci.c hw/xfree86/os-support/bus/linuxPci.c hw/xfree86/scanpci/extrapci.ids hw/xfree86/scanpci/pci.ids hw/xfree86/scanpci/pciid2c.pl hw/xfree86/scanpci/xf86PciStdIds.h |
||
---|---|---|
.. | ||
dixsym.c | ||
dlloader.c | ||
dlloader.h | ||
extsym.c | ||
fontsym.c | ||
loader.c | ||
loader.h | ||
loaderProcs.h | ||
loadext.c | ||
loadfont.c | ||
loadmod.c | ||
Makefile.am | ||
misym.c | ||
os.c | ||
SparcMulDiv.S | ||
sym.h | ||
xf86sym.c |