Merge branch 'origin' into softpipe_0_1_branch

author Keith Whitwell <keith@tungstengraphics.com>

Tue, 17 Jul 2007 10:06:31 +0000 (11:06 +0100)

committer Keith Whitwell <keith@tungstengraphics.com>

Tue, 17 Jul 2007 10:06:31 +0000 (11:06 +0100)
author Keith Whitwell <keith@tungstengraphics.com>
Tue, 17 Jul 2007 10:06:31 +0000 (11:06 +0100)
committer Keith Whitwell <keith@tungstengraphics.com>
Tue, 17 Jul 2007 10:06:31 +0000 (11:06 +0100)
diff --cc src/mesa/drivers/dri/i915tex/i915_vtbl.c
Simple merge
diff --cc src/mesa/drivers/dri/i915tex/intel_buffers.c
Simple merge
diff --cc src/mesa/drivers/dri/i915tex/intel_context.c
Simple merge
author	Keith Whitwell <keith@tungstengraphics.com>
	Tue, 17 Jul 2007 10:06:31 +0000 (11:06 +0100)
committer	Keith Whitwell <keith@tungstengraphics.com>
	Tue, 17 Jul 2007 10:06:31 +0000 (11:06 +0100)
		1	2
src/mesa/drivers/dri/i915tex/i915_vtbl.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i915tex/intel_buffers.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i915tex/intel_context.c	patch \|	diff1 \|	diff2 \|	blob \| history