a52c9b2a59
Conflicts: dix/dispatch.c dix/property.c hw/xfree86/common/xf86VidMode.c include/xkbsrv.h render/glyph.c xkb/xkbActions.c |
||
---|---|---|
.. | ||
cfb8_32.h | ||
cfb8_32module.c | ||
cfbcpyarea.c | ||
cfbcpyplane.c | ||
cfbgc.c | ||
cfbgcmisc.c | ||
cfbgcunder.c | ||
cfbimage.c | ||
cfbpntwin.c | ||
cfbscrinit.c | ||
cfbwindow.c | ||
Makefile.am | ||
xf86overlay.c |