Conflicts: hw/xfree86/common/xf86DoScanPci.c hw/xfree86/common/xf86Init.c hw/xfree86/common/xf86pciBus.c |
||
|---|---|---|
| .. | ||
| Makefile.am | ||
| vgaCmap.c | ||
| vgaHW.c | ||
| vgaHW.h | ||
| vgaHWmodule.c | ||
Conflicts: hw/xfree86/common/xf86DoScanPci.c hw/xfree86/common/xf86Init.c hw/xfree86/common/xf86pciBus.c |
||
|---|---|---|
| .. | ||
| Makefile.am | ||
| vgaCmap.c | ||
| vgaHW.c | ||
| vgaHW.h | ||
| vgaHWmodule.c | ||