Merge commit 'origin/gallium-master-merge'
authorBrian Paul <brianp@vmware.com>
Tue, 10 Feb 2009 23:44:02 +0000 (16:44 -0700)
committerBrian Paul <brianp@vmware.com>
Tue, 10 Feb 2009 23:44:02 +0000 (16:44 -0700)
commit5340b6dff73a0a23531ce2a5f28fba8303adab6e
treeb141fc3648568dd8b941c966059e6ed32a8bd0ad
parent9fd26daec24f21dbe17afcb2e2ab272667ee9a69
parentee4c921b65fb76998711f3c40330505cbc49a0e0
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
progs/demos/Makefile
src/mesa/main/context.c
src/mesa/main/fbobject.c
src/mesa/main/mtypes.h
src/mesa/main/state.c
src/mesa/main/texenvprogram.c
src/mesa/main/teximage.c