Merge commit 'origin/master' into radeon-rewrite
authorJerome Glisse <glisse@freedesktop.org>
Sun, 10 May 2009 14:57:22 +0000 (16:57 +0200)
committerJerome Glisse <glisse@freedesktop.org>
Sun, 10 May 2009 14:57:22 +0000 (16:57 +0200)
commit221b30d595ab2f97fd0518c761615dd28f3ef5ca
tree354ff4786ea95579edac01c5715a934783492dbe
parent13e0ff0df1bb75993bded7b248dd37f58fbfd22c
parent53c2cc8fefa07723fc456d94eda292e201c41dae
Merge commit 'origin/master' into radeon-rewrite

Conflicts:
src/mesa/drivers/dri/r200/r200_state.c
src/mesa/drivers/dri/r300/r300_context.h
src/mesa/drivers/dri/r300/r300_fragprog.c
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/r300_texmem.c
src/mesa/drivers/dri/r300/r300_texstate.c
src/mesa/drivers/dri/r300/r500_fragprog.c
src/mesa/drivers/dri/radeon/radeon_screen.c
src/mesa/drivers/dri/radeon/radeon_state.c
configure.ac
src/mesa/drivers/dri/r200/r200_state.c
src/mesa/drivers/dri/r300/r300_state.c