Merge remote branch 'origin/master' into gallium_draw_llvm

author Zack Rusin <zackr@vmware.com>

Mon, 15 Mar 2010 19:24:38 +0000 (15:24 -0400)

committer Zack Rusin <zackr@vmware.com>

Mon, 15 Mar 2010 19:24:38 +0000 (15:24 -0400)
author Zack Rusin <zackr@vmware.com>
Mon, 15 Mar 2010 19:24:38 +0000 (15:24 -0400)
committer Zack Rusin <zackr@vmware.com>
Mon, 15 Mar 2010 19:24:38 +0000 (15:24 -0400)
diff --cc src/gallium/auxiliary/SConscript
Simple merge
diff --cc src/gallium/auxiliary/draw/draw_context.c
Simple merge
diff --cc src/gallium/auxiliary/draw/draw_pt.c
Simple merge
diff --cc src/gallium/drivers/llvmpipe/lp_context.c
Simple merge
author	Zack Rusin <zackr@vmware.com>
	Mon, 15 Mar 2010 19:24:38 +0000 (15:24 -0400)
committer	Zack Rusin <zackr@vmware.com>
	Mon, 15 Mar 2010 19:24:38 +0000 (15:24 -0400)
		1	2
src/gallium/auxiliary/SConscript	patch \|	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/draw/draw_context.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/draw/draw_pt.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_context.c	patch \|	diff1 \|	diff2 \|	blob \| history