From: Alan Hourihane <alanh@vmware.com>
Date: Fri, 16 Jan 2009 16:44:53 +0000 (+0000)
Subject: Merge commit 'origin/master' into gallium-0.2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2e28c1fda24988241ef7abb91b7d896e38f5df26;p=mesa.git

Merge commit 'origin/master' into gallium-0.2

Conflicts:
	src/mesa/shader/slang/slang_compile.c
---

2e28c1fda24988241ef7abb91b7d896e38f5df26