From: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue, 1 Dec 2009 01:47:07 +0000 (-0800)
Subject: Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=650e02003fbb5511ec758d993b7ec0a302ee2235;p=mesa.git

Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

Conflicts:
	progs/util/shaderutil.c
	src/mesa/drivers/dri/r600/r600_context.c
	src/mesa/main/version.h
---

650e02003fbb5511ec758d993b7ec0a302ee2235