From: Ben Skeggs <skeggsb@gmail.com>
Date: Sat, 16 Feb 2008 05:30:22 +0000 (+1100)
Subject: Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=87e3301533aa4d3e6e98db139887ebba3d217f7d;p=mesa.git

Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1

Conflicts:

	configs/linux-dri
	src/mesa/pipe/Makefile
---

87e3301533aa4d3e6e98db139887ebba3d217f7d