Merge branch 'master' into r300g-glsl
authorNicolai Hähnle <nhaehnle@gmail.com>
Wed, 7 Oct 2009 18:45:08 +0000 (20:45 +0200)
committerNicolai Hähnle <nhaehnle@gmail.com>
Wed, 7 Oct 2009 18:45:08 +0000 (20:45 +0200)
commit7ca7220ea1d31dbdbf1fe7e6f3e6cc4ff8b0abde
treea4e50f36da7c75c945a2418738e2a84af2b3789d
parent57abb76e1095d14f54ea8b8d0d2220e209b8656f
parent5b4c0b864a25fa193e7ba828cf5ce483ca05bd4e
Merge branch 'master' into r300g-glsl

Conflicts:
src/gallium/drivers/r300/r300_tgsi_to_rc.c

Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
src/gallium/drivers/r300/r300_tgsi_to_rc.c
src/mesa/drivers/dri/r300/r300_fragprog_common.c