From: Roland Scheidegger <sroland@vmware.com>
Date: Thu, 26 Nov 2009 00:15:25 +0000 (+0100)
Subject: Merge commit 'origin/st-shader-varients'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4dcdf3b9c67f1481d46c1decba84c9c55698db4c;p=mesa.git

Merge commit 'origin/st-shader-varients'

Conflicts:
	src/mesa/state_tracker/st_atom_shader.c
	src/mesa/state_tracker/st_program.c
---

4dcdf3b9c67f1481d46c1decba84c9c55698db4c