Conflicts: dix/dispatch.c dix/property.c hw/xfree86/common/xf86VidMode.c include/xkbsrv.h render/glyph.c xkb/xkbActions.c |
||
|---|---|---|
| .. | ||
| Makefile.am | ||
| dbe.c | ||
| dbestruct.h | ||
| midbe.c | ||
| midbe.h | ||
| midbestr.h | ||
Conflicts: dix/dispatch.c dix/property.c hw/xfree86/common/xf86VidMode.c include/xkbsrv.h render/glyph.c xkb/xkbActions.c |
||
|---|---|---|
| .. | ||
| Makefile.am | ||
| dbe.c | ||
| dbestruct.h | ||
| midbe.c | ||
| midbe.h | ||
| midbestr.h | ||