Conflicts: dix/dispatch.c dix/property.c hw/xfree86/common/xf86VidMode.c include/xkbsrv.h render/glyph.c xkb/xkbActions.c |
||
|---|---|---|
| .. | ||
| Makefile.am | ||
| exa.c | ||
| exa.h | ||
| exa_accel.c | ||
| exa_migration.c | ||
| exa_offscreen.c | ||
| exa_priv.h | ||
| exa_render.c | ||
| exa_unaccel.c | ||
Conflicts: dix/dispatch.c dix/property.c hw/xfree86/common/xf86VidMode.c include/xkbsrv.h render/glyph.c xkb/xkbActions.c |
||
|---|---|---|
| .. | ||
| Makefile.am | ||
| exa.c | ||
| exa.h | ||
| exa_accel.c | ||
| exa_migration.c | ||
| exa_offscreen.c | ||
| exa_priv.h | ||
| exa_render.c | ||
| exa_unaccel.c | ||