From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Mon, 15 Dec 2008 11:22:19 +0000 (+0000)
Subject: Merge commit 'origin/gallium-0.1' into gallium-0.2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8abc860bd46a6cd584f9a64cb4613be76f82db06;p=mesa.git

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

Conflicts:

	src/gallium/winsys/gdi/SConscript
---

8abc860bd46a6cd584f9a64cb4613be76f82db06