Merge remote branch 'origin/master' into lp-setup-llvm
authorKeith Whitwell <keithw@vmware.com>
Mon, 18 Oct 2010 02:03:42 +0000 (19:03 -0700)
committerKeith Whitwell <keithw@vmware.com>
Mon, 18 Oct 2010 02:09:42 +0000 (19:09 -0700)
commit0072acd447dc6be652e63752e50215c3105322c8
tree847d1763b54772d336a04e606f8248291c3092b7
parent543fb77ddece7e1806e8eaa0d65bb2a945ef9a75
parentca2b2ac131933b4171b519813df1aaa3a81621cd
Merge remote branch 'origin/master' into lp-setup-llvm

Conflicts:
src/gallium/drivers/llvmpipe/lp_setup_coef.c
src/gallium/drivers/llvmpipe/lp_setup_coef.h
src/gallium/drivers/llvmpipe/lp_setup_coef_intrin.c
src/gallium/drivers/llvmpipe/lp_setup_point.c
src/gallium/drivers/llvmpipe/lp_setup_tri.c
src/gallium/drivers/llvmpipe/lp_state_derived.c
src/gallium/drivers/llvmpipe/lp_state_fs.h
13 files changed:
src/gallium/drivers/llvmpipe/Makefile
src/gallium/drivers/llvmpipe/SConscript
src/gallium/drivers/llvmpipe/lp_bld_interp.h
src/gallium/drivers/llvmpipe/lp_setup.c
src/gallium/drivers/llvmpipe/lp_setup.h
src/gallium/drivers/llvmpipe/lp_setup_context.h
src/gallium/drivers/llvmpipe/lp_setup_line.c
src/gallium/drivers/llvmpipe/lp_setup_point.c
src/gallium/drivers/llvmpipe/lp_setup_tri.c
src/gallium/drivers/llvmpipe/lp_state_derived.c
src/gallium/drivers/llvmpipe/lp_state_fs.c
src/gallium/drivers/llvmpipe/lp_state_fs.h
src/gallium/drivers/llvmpipe/lp_state_setup.c