Merge commit 'origin/master' into gallium-0.2
authorKeith Whitwell <keith@tungstengraphics.com>
Wed, 24 Sep 2008 00:08:24 +0000 (17:08 -0700)
committerKeith Whitwell <keith@tungstengraphics.com>
Wed, 24 Sep 2008 00:23:14 +0000 (17:23 -0700)
commit2cb3d2b7a0d8f505131e98053d3e19982012fccd
treeda9a95967c877f4b71c40dcdea681480f2e75cf2
parent9e7c0724bbc62c86dc302a9fe76b3e4288fc4461
parentec76910187adc88fc54907ffa3506309ee2abcf3
Merge commit 'origin/master' into gallium-0.2

Conflicts:

src/mesa/glapi/glapi_getproc.c
src/mesa/main/image.c
src/mesa/shader/slang/slang_link.c