| commit | 29c471aafc6a3fef23d553e31a555d1782854a77 | [log] [tgz] |
|---|---|---|
| author | Brian <brian@yutani.localnet.net> | Thu Feb 22 08:53:33 2007 -0700 |
| committer | Brian <brian@yutani.localnet.net> | Thu Feb 22 08:53:33 2007 -0700 |
| tree | 335385fd55d510118346136c6feb4daa707988b6 | |
| parent | 6d4cf6be4e79c3a6ab18272577df17389e3834a6 [diff] | |
| parent | a4b344baa2484c65a1618f3cce3a94c91dea8ef7 [diff] |
Merge branch 'origin' into glsl-compiler-1 Conflicts: src/mesa/main/state.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/programopt.c src/mesa/shader/slang/slang_execute.c src/mesa/sources src/mesa/swrast/s_arbshader.c src/mesa/swrast/s_context.c src/mesa/swrast/s_span.c src/mesa/swrast/s_zoom.c src/mesa/tnl/t_context.c src/mesa/tnl/t_save_api.c src/mesa/tnl/t_vb_arbprogram.c src/mesa/tnl/t_vp_build.c src/mesa/tnl/t_vtx_eval.c