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

src/mesa/shader/shader_api.c


Trivial merge