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)
1  2 
src/mesa/shader/shader_api.c
src/mesa/swrast/s_depth.c

Simple merge
Simple merge