Merge branch 'master' into r300-compiler
authorNicolai Hähnle <nhaehnle@gmail.com>
Mon, 21 Sep 2009 11:26:50 +0000 (13:26 +0200)
committerNicolai Hähnle <nhaehnle@gmail.com>
Mon, 21 Sep 2009 11:26:50 +0000 (13:26 +0200)
commit81c7561d9d3faf70ac22c6a5f3fbea18f53eed92
tree5ec097e0e1fe99804104d3a56923c16edf1533aa
parentf02f63997ce65530788a6dfcb28f11790a14d938
parent3083ba38f4c884b32cd0460607b5064b6b7008d2
Merge branch 'master' into r300-compiler

There were additional non-textual conflicts.

Conflicts:
src/gallium/drivers/r300/r300_tgsi_to_rc.c
src/mesa/drivers/dri/r300/compiler/r3xx_vertprog.c
src/mesa/drivers/dri/r300/compiler/radeon_program.c
src/mesa/drivers/dri/r300/compiler/radeon_program_alu.c
src/gallium/drivers/r300/Makefile
src/gallium/drivers/r300/r300_tgsi_to_rc.c
src/mesa/drivers/dri/r300/Makefile
src/mesa/drivers/dri/r300/compiler/r300_fragprog_emit.c
src/mesa/drivers/dri/r300/compiler/r3xx_vertprog.c
src/mesa/drivers/dri/r300/compiler/radeon_program_alu.c
src/mesa/drivers/dri/r300/r300_vertprog.c
src/mesa/drivers/dri/r300/radeon_mesa_to_rc.c