| Conflicts: dix/dispatch.c dix/property.c hw/xfree86/common/xf86VidMode.c include/xkbsrv.h render/glyph.c xkb/xkbActions.c | ||
|---|---|---|
| .. | ||
| apple | ||
| glx | ||
| mesa | ||
| windows | ||
| Makefile.am | ||
| symlink-mesa.sh | ||
| Conflicts: dix/dispatch.c dix/property.c hw/xfree86/common/xf86VidMode.c include/xkbsrv.h render/glyph.c xkb/xkbActions.c | ||
|---|---|---|
| .. | ||
| apple | ||
| glx | ||
| mesa | ||
| windows | ||
| Makefile.am | ||
| symlink-mesa.sh | ||