From: Brian Paul <brianp@vmware.com>
Date: Tue, 10 Feb 2009 23:44:02 +0000 (-0700)
Subject: Merge commit 'origin/gallium-master-merge'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5340b6dff73a0a23531ce2a5f28fba8303adab6e;p=mesa.git

Merge commit 'origin/gallium-master-merge'

This is the big merge of the gallium-0.2 branch into master.
gallium-master-merge was just the staging area for it.
Both gallium-0.2 and gallium-master-merge are considered closed now.

Conflicts:

	progs/demos/Makefile
	src/mesa/main/state.c
	src/mesa/main/texenvprogram.c
---

5340b6dff73a0a23531ce2a5f28fba8303adab6e