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)
commit880e3fb09b538f6f0b6fad2db7e0e10e9df43555
treee6cc8c691974e679ead73c3731c49a874019c8ba
parent93e342574f5fc95789028dbe7cf637257562e9bb
parent4afed821baa6993d85a07c67d42ea40d4e9a600a
Merge remote branch 'origin/master' into gallium_draw_llvm
src/gallium/auxiliary/SConscript
src/gallium/drivers/llvmpipe/lp_context.c