1f97a76476
Conflicts: dix/devices.c hw/xfree86/common/xf86Xinput.c hw/xfree86/loader/xf86sym.c mi/mieq.c |
||
---|---|---|
.. | ||
darwin | ||
dmx | ||
kdrive | ||
vfb | ||
xfree86 | ||
xgl | ||
xnest | ||
xprint | ||
xwin | ||
Makefile.am |
1f97a76476
Conflicts: dix/devices.c hw/xfree86/common/xf86Xinput.c hw/xfree86/loader/xf86sym.c mi/mieq.c |
||
---|---|---|
.. | ||
darwin | ||
dmx | ||
kdrive | ||
vfb | ||
xfree86 | ||
xgl | ||
xnest | ||
xprint | ||
xwin | ||
Makefile.am |