Merge remote branch 'origin/master' into gallium_draw_llvm
authorZack Rusin <zackr@vmware.com>
Mon, 15 Mar 2010 19:24:38 +0000 (15:24 -0400)
committerZack Rusin <zackr@vmware.com>
Mon, 15 Mar 2010 19:24:38 +0000 (15:24 -0400)
1  2 
src/gallium/auxiliary/SConscript
src/gallium/auxiliary/draw/draw_context.c
src/gallium/auxiliary/draw/draw_pt.c
src/gallium/drivers/llvmpipe/lp_context.c

Simple merge
Simple merge