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)
commit2a7dc7927339322fbffaba62d2fb69373b94caf0
treef59a65be187030739f409ae05432a025c2603789
parent62dd7575f07f3ff9803118113746dba9219c1390
parent9acf207277b4de91b917b37a92f6b612f4710c80
Merge commit 'origin/master' into gallium-0.2

Conflicts:

src/mesa/shader/shader_api.c