| commit | 658b1bdb1cc5f9910be910dc156a2e81ed999756 | [log] [tgz] |
|---|---|---|
| author | Alan Hourihane <alanh@vmware.com> | Wed Jan 14 23:33:41 2009 +0000 |
| committer | Alan Hourihane <alanh@vmware.com> | Wed Jan 14 23:33:41 2009 +0000 |
| tree | 98d15bcf83b662dd8c7186dd423e3d8ebbd87f1c | |
| parent | e82784559e00cb534993c01309ad1832e9b3e56b [diff] | |
| parent | 03188b09e071ace9d9e21ccc56c01e90c0fa8639 [diff] |
Merge commit 'origin/master' into gallium-0.2 Conflicts: docs/install.html docs/relnotes-7.3.html src/mesa/shader/slang/slang_codegen.c src/mesa/shader/slang/slang_compile.c src/mesa/shader/slang/slang_emit.c src/mesa/shader/slang/slang_preprocess.c src/mesa/shader/slang/slang_preprocess.h