Merge commit 'origin/master' into gallium-0.2
authorBrian Paul <brian.paul@tungstengraphics.com>
Tue, 16 Dec 2008 22:50:14 +0000 (15:50 -0700)
committerBrian Paul <brian.paul@tungstengraphics.com>
Tue, 16 Dec 2008 22:50:14 +0000 (15:50 -0700)
commitb0caa10a85b39f0e657dc0c4816884c9356b0b1a
tree812ec91f0cf375921533c2722de313461004aa20
parent3616fb08da8ef392db1d5ccab55b8eb9f6a6f32b
parent3be8d6db9e8bfbd1b3ebf9ac382857ad1e6ef753
Merge commit 'origin/master' into gallium-0.2
progs/tests/Makefile
src/glut/glx/Makefile
src/glut/glx/glutint.h
src/mesa/main/sources
src/mesa/main/texcompress_s3tc.c
src/mesa/shader/prog_parameter.c
src/mesa/shader/slang/slang_link.c
src/mesa/sources