Merge branch 'llvm-cliptest-viewport'

author Keith Whitwell <keithw@vmware.com>

Wed, 20 Oct 2010 04:41:28 +0000 (21:41 -0700)

committer Keith Whitwell <keithw@vmware.com>

Wed, 20 Oct 2010 04:41:28 +0000 (21:41 -0700)
author Keith Whitwell <keithw@vmware.com>
Wed, 20 Oct 2010 04:41:28 +0000 (21:41 -0700)
committer Keith Whitwell <keithw@vmware.com>
Wed, 20 Oct 2010 04:41:28 +0000 (21:41 -0700)
diff --cc src/gallium/auxiliary/draw/draw_context.c
Simple merge
diff --cc src/gallium/auxiliary/draw/draw_llvm.c
Simple merge
diff --cc src/gallium/auxiliary/draw/draw_llvm.h
Simple merge
author	Keith Whitwell <keithw@vmware.com>
	Wed, 20 Oct 2010 04:41:28 +0000 (21:41 -0700)
committer	Keith Whitwell <keithw@vmware.com>
	Wed, 20 Oct 2010 04:41:28 +0000 (21:41 -0700)
		1	2
src/gallium/auxiliary/draw/draw_context.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/draw/draw_llvm.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/draw/draw_llvm.h	patch \|	diff1 \|	diff2 \|	blob \| history