Merge remote branch 'origin/master' into radeon-rewrite
authorDave Airlie <airlied@redhat.com>
Thu, 12 Feb 2009 15:11:25 +0000 (01:11 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 12 Feb 2009 15:11:25 +0000 (01:11 +1000)
commit53116910b10e3b8a05f42970eff311c21808699f
tree6831e50a56a02fed324f8cb119e05d837e00d7cf
parent7e104f9cde94279a902b408e8d1cf21779b393a8
parent0ccbc3c905f0594a35d72887a1f115e148aaa596
Merge remote branch 'origin/master' into radeon-rewrite

Conflicts:
configure.ac
src/mesa/drivers/dri/r200/r200_context.c
src/mesa/drivers/dri/r300/r300_render.c
src/mesa/drivers/dri/r200/r200_context.c
src/mesa/drivers/dri/r300/r300_context.c
src/mesa/drivers/dri/r300/r300_reg.h
src/mesa/drivers/dri/r300/r300_render.c
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/radeon_program_pair.c
src/mesa/drivers/dri/radeon/radeon_context.c
src/mesa/drivers/dri/radeon/radeon_screen.c