From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 17 Oct 2008 20:13:00 +0000 (-0600)
Subject: Merge commit 'origin/gallium-0.1' into gallium-0.2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=87a6fe57e85ea5f273e808211a0e61d2b837b8e2;p=mesa.git

Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

	progs/trivial/tri.c
---

87a6fe57e85ea5f273e808211a0e61d2b837b8e2