Conflicts: Xext/xace.c Xext/xace.h |
||
|---|---|---|
| .. | ||
| Makefile.am | ||
| config-backends.h | ||
| config.c | ||
| dbus-api | ||
| dbus-core.c | ||
| dbus.c | ||
| hal.c | ||
| x11-input.fdi | ||
| xorg-server.conf | ||
Conflicts: Xext/xace.c Xext/xace.h |
||
|---|---|---|
| .. | ||
| Makefile.am | ||
| config-backends.h | ||
| config.c | ||
| dbus-api | ||
| dbus-core.c | ||
| dbus.c | ||
| hal.c | ||
| x11-input.fdi | ||
| xorg-server.conf | ||