Merge branch 'master' into r300-compiler
authorNicolai Hähnle <nhaehnle@gmail.com>
Sun, 6 Sep 2009 11:15:04 +0000 (13:15 +0200)
committerNicolai Hähnle <nhaehnle@gmail.com>
Sun, 6 Sep 2009 11:15:04 +0000 (13:15 +0200)
commitf02f63997ce65530788a6dfcb28f11790a14d938
treefc6aedb5256bfb84eb170cb82addd2b6605510f8
parente95e76e1255a3ad0ce604271301d090337b2e82b
parent9778731732b4753e79a1b786c65325a52392411d
Merge branch 'master' into r300-compiler

Conflicts:
src/gallium/drivers/r300/r300_tgsi_to_rc.c
src/mesa/drivers/dri/r300/Makefile
src/mesa/drivers/dri/r300/compiler/radeon_code.h
src/mesa/drivers/dri/r300/r300_fragprog_common.c
src/mesa/drivers/dri/r300/r300_vertprog.c