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

Merge commit 'origin/master' into gallium-0.2

Conflicts:

	src/mesa/main/drawpix.c
	src/mesa/shader/prog_uniform.c
	src/mesa/shader/slang/slang_link.c
---

62dd7575f07f3ff9803118113746dba9219c1390