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)
commit275c4bd3643d773210780cb8d578ca84f2604684
tree8266edc39d4253ac0f2a0ecd41f560f3d815bb5c
parentc5c5cd7132e18f4aad8e73d8ee879f8823c4c1e7
parentd0b35352ed27b1e66785c45ee95a352ed06b47ce
Merge remote branch 'origin/master' into gallium_draw_llvm
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