From: Keith Whitwell <keith@tungstengraphics.com>
Date: Fri, 10 Oct 2008 14:26:28 +0000 (+0100)
Subject: Merge commit 'origin/master' into gallium-0.2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3a3801c1431203fc4dca24d56577995ae2e78956;p=mesa.git

Merge commit 'origin/master' into gallium-0.2

Conflicts:

	src/mesa/glapi/descrip.mms
	src/mesa/shader/grammar/descrip.mms
---

3a3801c1431203fc4dca24d56577995ae2e78956