Conflicts: dix/events.c dix/getevents.c hw/xfree86/common/xf86Mode.c hw/xfree86/dri/Makefile.am hw/xfree86/os-support/drm/xf86drm.c hw/xfree86/os-support/xf86drm.h |
||
---|---|---|
.. | ||
dri.c | ||
dri.h | ||
drimodule.c | ||
dristruct.h | ||
Makefile.am | ||
sarea.h | ||
xf86dri.c |
Conflicts: dix/events.c dix/getevents.c hw/xfree86/common/xf86Mode.c hw/xfree86/dri/Makefile.am hw/xfree86/os-support/drm/xf86drm.c hw/xfree86/os-support/xf86drm.h |
||
---|---|---|
.. | ||
dri.c | ||
dri.h | ||
drimodule.c | ||
dristruct.h | ||
Makefile.am | ||
sarea.h | ||
xf86dri.c |