| commit | d7f1cb5b5a134b63227d5746a2dd1f05597c5c2f | [log] [tgz] |
|---|---|---|
| author | Keith Whitwell <keith@tungstengraphics.com> | Fri Oct 10 15:19:05 2008 +0100 |
| committer | Keith Whitwell <keith@tungstengraphics.com> | Fri Oct 10 15:23:36 2008 +0100 |
| tree | 7446e243da8b50f6cb323b7917bdb94fbd528368 | |
| parent | 7ac1fc77661faf0897507fef0437fe69d0ba53ac [diff] | |
| parent | f7556fdd40ed2719beaba271eee4a7551e212ad1 [diff] |
Merge commit 'origin/gallium-0.1' into gallium-0.2 Conflicts: src/gallium/auxiliary/gallivm/instructionssoa.cpp src/gallium/auxiliary/gallivm/soabuiltins.c src/gallium/auxiliary/rtasm/rtasm_x86sse.c src/gallium/auxiliary/rtasm/rtasm_x86sse.h src/mesa/main/texenvprogram.c src/mesa/shader/arbprogparse.c src/mesa/shader/prog_statevars.c src/mesa/state_tracker/st_draw.c src/mesa/vbo/vbo_exec_draw.c