Merge commit 'origin/master' into gallium-0.2
authorAlan Hourihane <alanh@tungstengraphics.com>
Mon, 8 Dec 2008 14:29:50 +0000 (14:29 +0000)
committerAlan Hourihane <alanh@tungstengraphics.com>
Mon, 8 Dec 2008 14:29:50 +0000 (14:29 +0000)
commit33a1f495d4bb19288680b9812c6ec1235302d215
treed47067fe24d530c660b75ee80cdcec72f10d9ed0
parentbcd5dda4358a5e47551278477bd00d2c63415c44
parentbdc8ac4426f00eaafbe8ca0d356563efe390294d
Merge commit 'origin/master' into gallium-0.2

Conflicts:

progs/glsl/Makefile
progs/glsl/Makefile
src/mesa/main/extensions.c
src/mesa/main/texcompress.c
src/mesa/shader/prog_statevars.c