![]() Conflicts: Makefile progs/demos/Makefile progs/glsl/Makefile progs/redbook/Makefile progs/samples/Makefile progs/tests/Makefile progs/trivial/Makefile progs/xdemos/Makefile src/gallium/Makefile src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/vbo/vbo_exec_draw.c |
17 anos atrás | |
---|---|---|
.. | ||
EGL | egl: define vsnprintf | 17 anos atrás |
GL | Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into gallium-0.2 | 17 anos atrás |
GLES | Remove CVS keywords. | 17 anos atrás |
GLES2 | Remove CVS keywords. | 17 anos atrás |
GLView.h | Stupid me. I don't know why I moved the GLView.h here at first, but now I know why | 21 anos atrás |