From: Keith Whitwell <keithw@vmware.com>
Date: Fri, 9 Jan 2009 10:08:06 +0000 (+0000)
Subject: Merge commit 'origin/gallium-0.2' into gallium-xlib-rework
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e3734593aea202e99e77febea7b86c904080939f;p=mesa.git

Merge commit 'origin/gallium-0.2' into gallium-xlib-rework

Conflicts:

	progs/glsl/Makefile
---

e3734593aea202e99e77febea7b86c904080939f