e34fcd2bf4
Conflicts: dix/devices.c dix/property.c include/dix.h |
||
---|---|---|
.. | ||
darwin | ||
dmx | ||
kdrive | ||
vfb | ||
xfree86 | ||
xgl | ||
xnest | ||
xprint | ||
xwin | ||
Makefile.am |
e34fcd2bf4
Conflicts: dix/devices.c dix/property.c include/dix.h |
||
---|---|---|
.. | ||
darwin | ||
dmx | ||
kdrive | ||
vfb | ||
xfree86 | ||
xgl | ||
xnest | ||
xprint | ||
xwin | ||
Makefile.am |