Merge commit 'origin/master' into gallium-0.2
authorBrian Paul <brian.paul@tungstengraphics.com>
Tue, 11 Nov 2008 21:42:41 +0000 (14:42 -0700)
committerBrian Paul <brian.paul@tungstengraphics.com>
Tue, 11 Nov 2008 21:42:41 +0000 (14:42 -0700)
commit19e4222f937c9bb95d3a899dd788afb930eecaa4
tree5bb25227f53ad93fbdb9dc889ded690dc40ad1d9
parent7f3d45758ccbbcff6428d57d26794960e3e9532c
parent90246d3ea54f54d60593dce1b89f0226058a3c56
Merge commit 'origin/master' into gallium-0.2

Conflicts:

src/mesa/shader/prog_execute.c
src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
13 files changed:
src/glx/x11/glxclient.h
src/glx/x11/indirect.c
src/mesa/drivers/dri/common/dri_util.c
src/mesa/main/ffvertex_prog.c
src/mesa/main/imports.h
src/mesa/main/teximage.c
src/mesa/shader/prog_instruction.h
src/mesa/shader/prog_parameter.c
src/mesa/shader/prog_print.c
src/mesa/shader/prog_uniform.c
src/mesa/shader/shader_api.c
src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
src/mesa/shader/slang/slang_link.c