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)
commit62dd7575f07f3ff9803118113746dba9219c1390
treef59a65be187030739f409ae05432a025c2603789
parent2cb3d2b7a0d8f505131e98053d3e19982012fccd
parent452a592ca4b1bac78eee53fb9f2f1deac7832840
Merge commit 'origin/master' into gallium-0.2

Conflicts:

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