Merge branch 'mesa_7_7_branch'
authorAndre Maasikas <amaasikas@gmail.com>
Tue, 8 Dec 2009 09:57:24 +0000 (11:57 +0200)
committerAndre Maasikas <amaasikas@gmail.com>
Tue, 8 Dec 2009 09:57:24 +0000 (11:57 +0200)
commitb5e256c76dea2182c82af2a4f66224735701d55a
tree42ab2283fc94ab3deefc30983aaa10f283897dd6
parentac66598ed8bc218720cf2a1a7493b7e25ca9d962
parent0d4a05445c6b47b93269a3829afbe509ffec4817
Merge branch 'mesa_7_7_branch'

Conflicts:
src/mesa/drivers/dri/r600/r700_assembler.c
src/mesa/main/version.h
src/gallium/drivers/llvmpipe/lp_bld_tgsi_soa.c
src/gallium/drivers/r300/Makefile
src/mesa/drivers/dri/r600/r700_assembler.c
src/mesa/drivers/dri/r600/r700_chip.c
src/mesa/drivers/dri/radeon/radeon_common.c
src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c