From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Fri, 30 May 2008 11:46:18 +0000 (+0200)
Subject: Merge branch 'gallium-tex-surfaces' into gallium-0.1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3869c3c87a40d9f41414082ad8dd3d747e6b34d8;p=mesa.git

Merge branch 'gallium-tex-surfaces' into gallium-0.1

Conflicts:

	src/gallium/drivers/i915simple/i915_context.h
---

3869c3c87a40d9f41414082ad8dd3d747e6b34d8