Merge commit 'origin/gallium-0.1' into gallium-0.2
authorBrian Paul <brian.paul@tungstengraphics.com>
Wed, 5 Nov 2008 22:58:09 +0000 (15:58 -0700)
committerBrian Paul <brian.paul@tungstengraphics.com>
Wed, 5 Nov 2008 22:58:09 +0000 (15:58 -0700)
commit80a718a63bf2fa817e346f0f5731ee9ef2e0e68b
tree4a1bdb03ae8b8482b9a15e56c9604fcc34e95b0e
parent7115b79b77e541f3eb81db00f6f0c34a0f224feb
parentde14fdd63f26a2e6fc55fad92c08966f269601a6
Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

src/gallium/auxiliary/rtasm/rtasm_execmem.c
src/mesa/shader/slang/slang_emit.c
src/mesa/shader/slang/slang_log.c
src/mesa/state_tracker/st_atom_framebuffer.c
12 files changed:
src/gallium/auxiliary/draw/draw_vs_exec.c
src/gallium/auxiliary/draw/draw_vs_sse.c
src/gallium/auxiliary/tgsi/tgsi_exec.c
src/gallium/auxiliary/tgsi/tgsi_sse2.c
src/gallium/auxiliary/util/u_mm.c
src/gallium/drivers/softpipe/sp_fs_sse.c
src/mesa/main/texenvprogram.c
src/mesa/shader/prog_uniform.c
src/mesa/shader/shader_api.c
src/mesa/state_tracker/st_atom_framebuffer.c
src/mesa/state_tracker/st_cb_clear.c
src/mesa/state_tracker/st_framebuffer.c