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)
commit87a6fe57e85ea5f273e808211a0e61d2b837b8e2
tree0ed8f21ce93e75f21b41bad302bfc057255bb17d
parentb50a0b89d946cac3c18a84c3a77cc8dcf96eeec7
parentd422c1eb5c0fac8f946758ecce96072505c77683
Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

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