| commit | cc7dd4fc1b3c765ca1ecd943d189bb156dae529d | [log] [tgz] |
|---|---|---|
| author | Keith Whitwell <keith@tungstengraphics.com> | Thu Sep 11 18:32:05 2008 +0100 |
| committer | Keith Whitwell <keith@tungstengraphics.com> | Thu Sep 11 18:32:05 2008 +0100 |
| tree | 1a3560eb6df8a443c4f0e5af0a916f190b1542f6 | |
| parent | 685248bea1fef5fd6335982570e34d0f6672030d [diff] | |
| parent | d50d68a1c940ed9c8d8c65e8e33667fa90d5baa1 [diff] |
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