Merge commit 'origin/master' into gallium-0.2
authorBrian Paul <brianp@vmware.com>
Fri, 19 Dec 2008 23:56:56 +0000 (16:56 -0700)
committerBrian Paul <brianp@vmware.com>
Fri, 19 Dec 2008 23:56:56 +0000 (16:56 -0700)
commit58a82ee57f1e1e67387dd860ac253223db250789
tree031ee528fc49bec03d767c8c697f40d15a9ed616
parent9c8db8685432fedd068157795422764ce96b89a0
parentf83f5ec8f5f1159cfd0ec2596ceab725c073266e
Merge commit 'origin/master' into gallium-0.2
progs/glsl/Makefile