Conflicts: GL/glx/glxscreens.c hw/xnest/Screen.c render/glyph.c render/glyphstr.h render/render.c |
||
|---|---|---|
| .. | ||
| apple | ||
| glx | ||
| mesa | ||
| windows | ||
| Makefile.am | ||
| symlink-mesa.sh | ||
Conflicts: GL/glx/glxscreens.c hw/xnest/Screen.c render/glyph.c render/glyphstr.h render/render.c |
||
|---|---|---|
| .. | ||
| apple | ||
| glx | ||
| mesa | ||
| windows | ||
| Makefile.am | ||
| symlink-mesa.sh | ||