Merge commit 'origin/master' into gallium-0.2

diff --cc progs/glsl/Makefile
index 04c1d25ed7f4218b8105607e8501d9b3b333a3bd,41d58499195857c9f3dff08eff5405fe7f734023..0874cfc59e3ca1411b70cbd143e1a21177787c58
--- 1/progs/glsl/Makefile
--- 2/progs/glsl/Makefile
+++ b/progs/glsl/Makefile
@@@ -142,17 -135,24 +143,24 @@@ points: points.o shaderutil.
  
  
  pointcoord.o: pointcoord.c readtex.h extfuncs.h shaderutil.h
 -      $(CC) -c -I$(INCDIR) $(CFLAGS) pointcoord.c
 +      $(APP_CC) -c -I$(INCDIR) $(CFLAGS) pointcoord.c
  
  pointcoord: pointcoord.o readtex.o shaderutil.o
 -      $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) pointcoord.o readtex.o shaderutil.o $(LIBS) -o $@
 +      $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) pointcoord.o readtex.o shaderutil.o $(LIBS) -o $@
  
  
+ skinning.o: skinning.c readtex.h extfuncs.h shaderutil.h
+       $(CC) -c -I$(INCDIR) $(CFLAGS) skinning.c
+ 
+ skinning: skinning.o readtex.o shaderutil.o
+       $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) skinning.o readtex.o shaderutil.o $(LIBS) -o $@
+ 
+ 
  texdemo1.o: texdemo1.c readtex.h extfuncs.h shaderutil.h
 -      $(CC) -c -I$(INCDIR) $(CFLAGS) texdemo1.c
 +      $(APP_CC) -c -I$(INCDIR) $(CFLAGS) texdemo1.c
  
  texdemo1: texdemo1.o readtex.o shaderutil.o
 -      $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) texdemo1.o readtex.o shaderutil.o $(LIBS) -o $@
 +      $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) texdemo1.o readtex.o shaderutil.o $(LIBS) -o $@
  
  
  toyball.o: toyball.c extfuncs.h shaderutil.h

diff --cc progs/glsl/convolutions.c
Simple merge