From: Michal Krol <michal@vmware.com>
Date: Sat, 12 Dec 2009 15:48:32 +0000 (+0100)
Subject: Merge branch 'master' into glsl-pp-rework-2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a3eb0f718e19653a2ad8e49396c904183be456f3;p=mesa.git

Merge branch 'master' into glsl-pp-rework-2

Conflicts:
	progs/perf/drawoverhead.c
	progs/perf/teximage.c
	progs/perf/vbo.c
	progs/perf/vertexrate.c
	src/mesa/shader/slang/library/slang_common_builtin_gc.h
---

a3eb0f718e19653a2ad8e49396c904183be456f3