Merge commit 'origin/master' into gallium-0.2
authorBrian Paul <brian.paul@tungstengraphics.com>
Mon, 24 Nov 2008 21:08:58 +0000 (14:08 -0700)
committerBrian Paul <brian.paul@tungstengraphics.com>
Mon, 24 Nov 2008 21:08:58 +0000 (14:08 -0700)
commitdf6155fcff66034457b3165f5df0a61ccfc41314
tree533a3edc14a84d654ce5dd1f2eb305a42a138991
parent868c607c1751fc3e6df1a8dc45e8b70e6bc315f6
parentb730d0d3e9b202b17a0815cb820fc9905f35cb98
Merge commit 'origin/master' into gallium-0.2

Conflicts:

progs/glsl/Makefile
progs/glsl/Makefile
src/mesa/main/config.h
src/mesa/main/mtypes.h
src/mesa/shader/slang/slang_link.c