From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 11 Dec 2008 01:11:31 +0000 (-0700)
Subject: Merge commit 'origin/gallium-0.1' into gallium-0.2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0c31661e73dd2979df22a275452efc71c7064f81;p=mesa.git

Merge commit 'origin/gallium-0.1' into gallium-0.2
---

0c31661e73dd2979df22a275452efc71c7064f81
diff --cc progs/trivial/Makefile
index 40ee5e81c41,cfe7fe6f31e..f7bfd1f039d
--- a/progs/trivial/Makefile
+++ b/progs/trivial/Makefile
@@@ -76,7 -75,9 +76,8 @@@ SOURCES = 
  	quadstrip-cont.c \
  	quadstrip-flat.c \
  	quadstrip.c \
 -	tri-orig.c \
  	tri-alpha.c \
+ 	tri-array-interleaved.c \
  	tri-blend-color.c \
  	tri-blend-max.c \
  	tri-blend-min.c \