Merge commit 'origin/master' into gallium-0.2
authorBrian Paul <brianp@vmware.com>
Wed, 31 Dec 2008 01:01:15 +0000 (18:01 -0700)
committerBrian Paul <brianp@vmware.com>
Wed, 31 Dec 2008 01:01:15 +0000 (18:01 -0700)
commitc789bd376f09c3b61617aeef6f5adbba2c541178
treeb50aba807e609ef6084e52d814370a2cc761f1c8
parent369115e4c7a2985d880951fd8248deefa92025dd
parente8d7db31e2a6784c765911233cb3d888f612837f
Merge commit 'origin/master' into gallium-0.2

Conflicts:

src/mesa/main/config.h
src/mesa/main/config.h
src/mesa/shader/prog_statevars.h
src/mesa/shader/slang/slang_link.c