Merge branch 'mesa_7_6_branch'
authorNicolai Hähnle <nhaehnle@gmail.com>
Wed, 7 Oct 2009 18:39:22 +0000 (20:39 +0200)
committerNicolai Hähnle <nhaehnle@gmail.com>
Wed, 7 Oct 2009 18:39:22 +0000 (20:39 +0200)
commit5b4c0b864a25fa193e7ba828cf5ce483ca05bd4e
treef462528c24889bee0665451e9e32664ecf2add3c
parent3f5a316f36e2d376104640033c8bcefef3810ef4
parent9fde81bb20bbfd2f8da80749cb84d890843a7bc2
Merge branch 'mesa_7_6_branch'
src/mesa/shader/shader_api.c
src/mesa/swrast/s_depth.c