Merge commit 'origin/gallium-0.1' into gallium-0.2
authorKeith Whitwell <keith@tungstengraphics.com>
Thu, 11 Sep 2008 17:32:05 +0000 (18:32 +0100)
committerKeith Whitwell <keith@tungstengraphics.com>
Thu, 11 Sep 2008 17:32:05 +0000 (18:32 +0100)
commitcc7dd4fc1b3c765ca1ecd943d189bb156dae529d
tree1a3560eb6df8a443c4f0e5af0a916f190b1542f6
parent685248bea1fef5fd6335982570e34d0f6672030d
parentd50d68a1c940ed9c8d8c65e8e33667fa90d5baa1
Merge commit 'origin/gallium-0.1' into gallium-0.2

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
13 files changed:
Makefile
configs/default
progs/demos/Makefile
progs/glsl/Makefile
progs/redbook/Makefile
progs/samples/Makefile
progs/tests/Makefile
progs/trivial/Makefile
progs/xdemos/Makefile
src/glut/glx/glut_event.c
src/mesa/shader/prog_statevars.c
src/mesa/shader/prog_statevars.h
src/mesa/vbo/vbo_exec_draw.c