Merge commit 'origin/master' into gallium-0.2
authorAlan Hourihane <alanh@tungstengraphics.com>
Wed, 5 Nov 2008 11:59:12 +0000 (11:59 +0000)
committerAlan Hourihane <alanh@tungstengraphics.com>
Wed, 5 Nov 2008 11:59:12 +0000 (11:59 +0000)
commit2382dc8aff9983da9ef1be03de38d4ab82105b19
tree9a468d991fa58d0bb41244ee343410fd7dabdcf8
parent9e1f0e173e5619d2ce95a74158803d94b3d6ff8a
parentaab429c8df228271786890691a43786baf091b37
Merge commit 'origin/master' into gallium-0.2
progs/glsl/Makefile
progs/glsl/convolutions.c