Conflicts: hw/xfree86/common/xf86DoScanPci.c hw/xfree86/common/xf86Init.c hw/xfree86/common/xf86pciBus.c |
||
---|---|---|
.. | ||
dri.c | ||
dri.h | ||
drimodule.c | ||
dristruct.h | ||
Makefile.am | ||
sarea.h | ||
xf86dri.c |
Conflicts: hw/xfree86/common/xf86DoScanPci.c hw/xfree86/common/xf86Init.c hw/xfree86/common/xf86pciBus.c |
||
---|---|---|
.. | ||
dri.c | ||
dri.h | ||
drimodule.c | ||
dristruct.h | ||
Makefile.am | ||
sarea.h | ||
xf86dri.c |