projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2cb3d2b 452a592)
Merge commit 'origin/master' into gallium-0.2
authorKeith Whitwell <keith@tungstengraphics.com>
Wed, 24 Sep 2008 00:24:39 +0000 (17:24 -0700)
committerKeith Whitwell <keith@tungstengraphics.com>
Wed, 24 Sep 2008 00:24:39 +0000 (17:24 -0700)
Conflicts:

src/mesa/main/drawpix.c
src/mesa/shader/prog_uniform.c
src/mesa/shader/slang/slang_link.c


Trivial merge