From: Keith Whitwell <keith@tungstengraphics.com>
Date: Wed, 24 Sep 2008 00:08:24 +0000 (-0700)
Subject: Merge commit 'origin/master' into gallium-0.2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2cb3d2b7a0d8f505131e98053d3e19982012fccd;p=mesa.git

Merge commit 'origin/master' into gallium-0.2

Conflicts:

	src/mesa/glapi/glapi_getproc.c
	src/mesa/main/image.c
	src/mesa/shader/slang/slang_link.c
---

2cb3d2b7a0d8f505131e98053d3e19982012fccd