97c150b61b
Conflicts: afb/afbpntwin.c afb/afbscrinit.c afb/afbwindow.c cfb/cfb.h cfb/cfballpriv.c cfb/cfbscrinit.c cfb/cfbwindow.c configure.ac fb/wfbrename.h hw/xfree86/xf4bpp/ppcIO.c hw/xfree86/xf4bpp/ppcPntWin.c hw/xfree86/xf4bpp/ppcWindow.c hw/xfree86/xf8_32bpp/cfbscrinit.c mfb/mfb.h mfb/mfbpntwin.c mfb/mfbscrinit.c mfb/mfbwindow.c mi/miexpose.c Note: conflicts caused by devPrivates rework vs. paintwindow changes. |
||
---|---|---|
.. | ||
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 |