Merge remote branch 'origin/master' into gallium_draw_llvm
authorZack Rusin <zackr@vmware.com>
Wed, 31 Mar 2010 01:10:33 +0000 (21:10 -0400)
committerZack Rusin <zackr@vmware.com>
Wed, 31 Mar 2010 01:10:33 +0000 (21:10 -0400)
1  2 
src/gallium/auxiliary/SConscript
src/gallium/drivers/llvmpipe/lp_context.c

Simple merge