1f0075786f
Conflicts: configure.ac dix/getevents.c hw/xfree86/ramdac/xf86Cursor.c mi/mipointer.c xkb/xkbUtils.c |
||
---|---|---|
.. | ||
dri.c | ||
dri.h | ||
drimodule.c | ||
dristruct.h | ||
Makefile.am | ||
sarea.h | ||
xf86dri.c |
1f0075786f
Conflicts: configure.ac dix/getevents.c hw/xfree86/ramdac/xf86Cursor.c mi/mipointer.c xkb/xkbUtils.c |
||
---|---|---|
.. | ||
dri.c | ||
dri.h | ||
drimodule.c | ||
dristruct.h | ||
Makefile.am | ||
sarea.h | ||
xf86dri.c |