Conflicts: Xext/appgroup.c Xext/security.c dix/devices.c dix/dispatch.c dix/dixutils.c dix/events.c dix/extension.c dix/property.c dix/window.c os/access.c |
||
---|---|---|
.. | ||
darwin | ||
dmx | ||
kdrive | ||
vfb | ||
xfree86 | ||
xgl | ||
xnest | ||
xprint | ||
xwin | ||
Makefile.am |
Conflicts: Xext/appgroup.c Xext/security.c dix/devices.c dix/dispatch.c dix/dixutils.c dix/events.c dix/extension.c dix/property.c dix/window.c os/access.c |
||
---|---|---|
.. | ||
darwin | ||
dmx | ||
kdrive | ||
vfb | ||
xfree86 | ||
xgl | ||
xnest | ||
xprint | ||
xwin | ||
Makefile.am |