Merge commit 'origin/master' into gallium-0.2
authorBrian Paul <brianp@vmware.com>
Fri, 2 Jan 2009 23:32:26 +0000 (16:32 -0700)
committerBrian Paul <brianp@vmware.com>
Fri, 2 Jan 2009 23:32:26 +0000 (16:32 -0700)
commit0815ebccfc0a12d8f3e831928f1c4210b7f75ad8
tree1e7db7e1d44e741215e5b4b11d33df91fe5b39a0
parenteb9bbc5265562cb6f93688fc027ea76f91601e37
parent1fad6ccb756ae33ca3115f59c99ca8abbeb0321e
Merge commit 'origin/master' into gallium-0.2

Conflicts:

src/mesa/main/ffvertex_prog.c
src/mesa/main/texenvprogram.c
progs/glsl/Makefile
src/mesa/main/bufferobj.c
src/mesa/main/config.h
src/mesa/main/context.c
src/mesa/main/enable.c
src/mesa/main/ffvertex_prog.c
src/mesa/main/mtypes.h
src/mesa/main/texenvprogram.c
src/mesa/shader/prog_parameter.c
src/mesa/shader/slang/slang_link.c