Merge branch 'mesa_7_6_branch'
authorBrian Paul <brianp@vmware.com>
Thu, 24 Sep 2009 17:03:16 +0000 (11:03 -0600)
committerBrian Paul <brianp@vmware.com>
Thu, 24 Sep 2009 17:03:16 +0000 (11:03 -0600)
commitc9f7a23ef05adfd2ebae56ee9f1b19897a589831
treea2107e8f2bf720dd7ad46f64b8c8dc6a693310d6
parent6be2bc56af5c0d281d07e427863789e949904db1
parent7549a8397b310acf672f97a08c8e7d866cdf492c
Merge branch 'mesa_7_6_branch'

Conflicts:

src/mesa/drivers/dri/r600/r700_assembler.c
src/mesa/drivers/dri/r600/r700_chip.c
src/mesa/drivers/dri/r600/r700_render.c
src/mesa/drivers/dri/r600/r700_vertprog.c
src/mesa/drivers/dri/r600/r700_vertprog.h
src/mesa/drivers/dri/radeon/radeon_span.c
src/gallium/auxiliary/tgsi/tgsi_sse2.c