Conflicts: Xext/xprint.c (removed in master) config/hal.c dix/main.c hw/kdrive/ati/ati_cursor.c (removed in master) hw/kdrive/i810/i810_cursor.c (removed in master) hw/xprint/ddxInit.c (removed in master) xkb/ddxLoad.c |
||
|---|---|---|
| .. | ||
| dmx | ||
| kdrive | ||
| vfb | ||
| xfree86 | ||
| xgl | ||
| xnest | ||
| xquartz | ||
| xwin | ||
| Makefile.am | ||