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

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

Conflicts:

	src/mesa/pipe/nouveau/nouveau_stateobj.h
	src/mesa/pipe/nv40/nv40_context.c
	src/mesa/pipe/nv40/nv40_miptree.c
---

49405c43f245d3b3ddd12e891413bf7ead23145c