99d28c3ef3
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 |
||
---|---|---|
.. | ||
animcur.c | ||
filter.c | ||
glyph.c | ||
glyphstr.h | ||
Makefile.am | ||
miindex.c | ||
mipict.c | ||
mipict.h | ||
mirect.c | ||
mitrap.c | ||
mitri.c | ||
picture.c | ||
picture.h | ||
picturestr.h | ||
render.c | ||
renderedge.c | ||
renderedge.h |