Conflicts: dix/devices.c hw/xfree86/common/xf86Xinput.c hw/xfree86/loader/xf86sym.c mi/mieq.c |
||
|---|---|---|
| .. | ||
| Makefile.am | ||
| dri.c | ||
| dri.h | ||
| drimodule.c | ||
| dristruct.h | ||
| sarea.h | ||
| xf86dri.c | ||
Conflicts: dix/devices.c hw/xfree86/common/xf86Xinput.c hw/xfree86/loader/xf86sym.c mi/mieq.c |
||
|---|---|---|
| .. | ||
| Makefile.am | ||
| dri.c | ||
| dri.h | ||
| drimodule.c | ||
| dristruct.h | ||
| sarea.h | ||
| xf86dri.c | ||