Merge branch 'master' of git+ssh://znh@git.freedesktop.org/git/mesa/mesa into 965...

author Zou Nan hai <nanhai.zou@intel.com>

Wed, 4 Jul 2007 02:52:35 +0000 (10:52 +0800)

committer Zou Nan hai <nanhai.zou@intel.com>

Wed, 4 Jul 2007 02:52:35 +0000 (10:52 +0800)
author Zou Nan hai <nanhai.zou@intel.com>
Wed, 4 Jul 2007 02:52:35 +0000 (10:52 +0800)
committer Zou Nan hai <nanhai.zou@intel.com>
Wed, 4 Jul 2007 02:52:35 +0000 (10:52 +0800)
diff --cc src/mesa/drivers/dri/i965/brw_vs_tnl.c
Simple merge
diff --cc src/mesa/drivers/dri/i965/intel_context.c
Simple merge
diff --cc src/mesa/shader/slang/slang_codegen.c
Simple merge
author	Zou Nan hai <nanhai.zou@intel.com>
	Wed, 4 Jul 2007 02:52:35 +0000 (10:52 +0800)
committer	Zou Nan hai <nanhai.zou@intel.com>
	Wed, 4 Jul 2007 02:52:35 +0000 (10:52 +0800)
		1	2
src/mesa/drivers/dri/i965/brw_vs_tnl.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/intel_context.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mesa/shader/slang/slang_codegen.c	patch \|	diff1 \|	diff2 \|	blob \| history