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. |
||
|---|---|---|
| .. | ||
| Makefile.am | ||
| agpgart.h | ||
| apSolaris.shar | ||
| solaris-amd64.S | ||
| solaris-ia32.S | ||
| solaris-sparcv8plus.S | ||
| sun_agp.c | ||
| sun_apm.c | ||
| sun_bell.c | ||
| sun_bios.c | ||
| sun_init.c | ||
| sun_inout.s | ||
| sun_mouse.c | ||
| sun_vid.c | ||