From: Michel Dänzer <daenzer@vmware.com>
Date: Wed, 20 May 2009 15:00:48 +0000 (+0200)
Subject: Merge branch 'master' into radeon-rewrite
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b9bd1abf2664a75642ee5e1999697bbe480b9172;p=mesa.git

Merge branch 'master' into radeon-rewrite

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

b9bd1abf2664a75642ee5e1999697bbe480b9172