From: Nicolai Hähnle <nhaehnle@gmail.com>
Date: Sun, 6 Sep 2009 11:15:04 +0000 (+0200)
Subject: Merge branch 'master' into r300-compiler
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f02f63997ce65530788a6dfcb28f11790a14d938;p=mesa.git

Merge branch 'master' into r300-compiler

Conflicts:
	src/gallium/drivers/r300/r300_tgsi_to_rc.c
---

f02f63997ce65530788a6dfcb28f11790a14d938