From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Mon, 15 Dec 2008 11:16:03 +0000 (+0000)
Subject: Merge commit 'origin/master' into gallium-0.2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a22d865f93a1db7f72e0bfe216810f67bf4c2f2c;p=mesa.git

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

a22d865f93a1db7f72e0bfe216810f67bf4c2f2c
diff --cc progs/glsl/.gitignore
index d5d9d915b64,21c41da0cd5..5d954519b24
--- a/progs/glsl/.gitignore
+++ b/progs/glsl/.gitignore
@@@ -1,15 -1,12 +1,16 @@@
  bitmap
  brick
  bump
 +convolutions
  deriv
  extfuncs.h
 +fragcoord
 +identity
  mandelbrot
+ multinoise
  multitex
  noise
 +pointcoord
  points
  readtex.c
  readtex.h
diff --cc progs/glsl/Makefile
index 488a4e99513,856de91c905..71ca0af9412
--- a/progs/glsl/Makefile
+++ b/progs/glsl/Makefile
@@@ -15,9 -15,9 +15,10 @@@ PROGS = 
  	bump \
  	convolutions \
  	deriv \
 +	identity \
  	fragcoord \
  	mandelbrot \
+ 	multinoise \
  	multitex \
  	noise \
  	points \