Merge branch 'mesa_7_6_branch'

author Nicolai Hähnle <nhaehnle@gmail.com>

Wed, 7 Oct 2009 18:39:22 +0000 (20:39 +0200)

committer Nicolai Hähnle <nhaehnle@gmail.com>

Wed, 7 Oct 2009 18:39:22 +0000 (20:39 +0200)
author Nicolai Hähnle <nhaehnle@gmail.com>
Wed, 7 Oct 2009 18:39:22 +0000 (20:39 +0200)
committer Nicolai Hähnle <nhaehnle@gmail.com>
Wed, 7 Oct 2009 18:39:22 +0000 (20:39 +0200)
diff --cc src/mesa/shader/shader_api.c
Simple merge
diff --cc src/mesa/swrast/s_depth.c
Simple merge
author	Nicolai Hähnle <nhaehnle@gmail.com>
	Wed, 7 Oct 2009 18:39:22 +0000 (20:39 +0200)
committer	Nicolai Hähnle <nhaehnle@gmail.com>
	Wed, 7 Oct 2009 18:39:22 +0000 (20:39 +0200)
		1	2
src/mesa/shader/shader_api.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mesa/swrast/s_depth.c	patch \|	diff1 \|	diff2 \|	blob \| history