From: Alan Hourihane <alanh@vmware.com>
Date: Thu, 22 Jan 2009 09:43:42 +0000 (+0000)
Subject: Merge commit 'origin/master' into gallium-0.2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4df482086ebf0663c708b089d8d8d22de0ef972c;p=mesa.git

Merge commit 'origin/master' into gallium-0.2

Conflicts:
	windows/VC8/mesa/osmesa/osmesa.vcproj
	windows/VC8/progs/demos/gears.vcproj
	windows/VC8/progs/progs.sln
---

4df482086ebf0663c708b089d8d8d22de0ef972c
diff --cc progs/tests/Makefile
index b96ad9f4b46,5f17f88d36c..34c9ab1dcef
--- a/progs/tests/Makefile
+++ b/progs/tests/Makefile
@@@ -62,9 -59,9 +63,10 @@@ SOURCES = 
  	pbo.c \
  	prog_parameter.c \
  	projtex.c \
 +	quads.c \
  	random.c \
  	readrate.c \
+ 	rubberband.c \
  	seccolor.c \
  	shader_api.c \
  	sharedtex.c \