Merge remote branch 'origin/master' into lp-binning
authorJosé Fonseca <jfonseca@vmware.com>
Sat, 16 Jan 2010 23:21:06 +0000 (23:21 +0000)
committerJosé Fonseca <jfonseca@vmware.com>
Sat, 16 Jan 2010 23:21:06 +0000 (23:21 +0000)
commitba5d600c90f7075cf2c33a0c5c679ef822e8746e
treeec6794fba9f2fe563a8bbc03ca06e288b7f51c28
parentfdfe06ad804ea13e6e436d66c1bcafe0bde2f545
parent164fd16cfbc09970676c2e6866e062a5c9b410db
Merge remote branch 'origin/master' into lp-binning

Conflicts:
src/gallium/drivers/llvmpipe/lp_quad.h
src/gallium/drivers/llvmpipe/lp_setup.c
progs/trivial/Makefile
progs/trivial/SConscript
src/gallium/drivers/llvmpipe/lp_context.c
src/gallium/drivers/llvmpipe/lp_context.h
src/gallium/drivers/llvmpipe/lp_rast.h
src/gallium/drivers/llvmpipe/lp_state.h
src/gallium/drivers/llvmpipe/lp_state_derived.c
src/gallium/drivers/llvmpipe/lp_state_fs.c