Merge commit 'origin/gallium-0.1' into gallium-0.2
authorBrian Paul <brian.paul@tungstengraphics.com>
Fri, 17 Oct 2008 20:13:00 +0000 (14:13 -0600)
committerBrian Paul <brian.paul@tungstengraphics.com>
Fri, 17 Oct 2008 20:13:00 +0000 (14:13 -0600)
Conflicts:

progs/trivial/tri.c

1  2 
progs/trivial/tri.c
src/mesa/state_tracker/st_cb_texture.c

Simple merge