a52c9b2a59
Conflicts: dix/dispatch.c dix/property.c hw/xfree86/common/xf86VidMode.c include/xkbsrv.h render/glyph.c xkb/xkbActions.c |
||
|---|---|---|
| .. | ||
| Makefile.am | ||
| shadow.c | ||
| shadow.h | ||
| shalloc.c | ||
| shpacked.c | ||
| shplanar.c | ||
| shplanar8.c | ||
| shrot8pack.c | ||
| shrot8pack_90.c | ||
| shrot8pack_180.c | ||
| shrot8pack_270.c | ||
| shrot16pack.c | ||
| shrot16pack_90.c | ||
| shrot16pack_90YX.c | ||
| shrot16pack_180.c | ||
| shrot16pack_270.c | ||
| shrot16pack_270YX.c | ||
| shrot32pack.c | ||
| shrot32pack_90.c | ||
| shrot32pack_180.c | ||
| shrot32pack_270.c | ||
| shrotate.c | ||
| shrotpack.h | ||
| shrotpackYX.h | ||