Merge branch 'master' into radeon-rewrite
authorMichel Dänzer <daenzer@vmware.com>
Wed, 20 May 2009 15:00:48 +0000 (17:00 +0200)
committerMichel Dänzer <daenzer@vmware.com>
Wed, 20 May 2009 15:00:48 +0000 (17:00 +0200)
commitb9bd1abf2664a75642ee5e1999697bbe480b9172
tree06e34f206854badbb1ec5f31abdf661900ab389e
parentc696dd0f62c195d71cf7ecbdd04d9b156dd0da0b
parent0c75cb5afe81b0de9d006f9f9b75fdc9a15038d0
Merge branch 'master' into radeon-rewrite

Conflicts:
src/mesa/drivers/dri/r300/r300_context.c
src/mesa/drivers/dri/r300/r300_texstate.c