commit | 81c862205e32b163a9f5ecf3f59e4cdcccee36c6 | [log] [tgz] |
---|---|---|
author | Alan Hourihane <alanh@tungstengraphics.com> | Sat Nov 01 22:57:26 2008 +0000 |
committer | Alan Hourihane <alanh@tungstengraphics.com> | Sat Nov 01 22:57:26 2008 +0000 |
tree | 50a5f45f1a0823758e72968d1f1dfd6e0d1098e0 | |
parent | 14e1505cce24ee294cb98683504cc4537c20f34a [diff] | |
parent | bbffed0857634912c7a1f13882eba303ae2bf4e1 [diff] |
Merge commit 'origin/master' into gallium-0.2 Conflicts: src/mesa/shader/slang/library/slang_vertex_builtin_gc.h