From: José Fonseca <jfonseca@vmware.com>
Date: Thu, 8 Jan 2009 12:31:14 +0000 (+0000)
Subject: Merge commit 'origin/gallium-0.1' into gallium-0.2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a3ee0aa1bb7c3f9dfc5b13b4e72522c10a22ad05;p=mesa.git

Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

	src/gallium/auxiliary/tgsi/tgsi_exec.c
	src/gallium/drivers/cell/spu/spu_command.h
	src/gallium/include/pipe/p_shader_tokens.h
	src/mesa/main/config.h
	src/mesa/main/mtypes.h
	src/mesa/shader/prog_execute.c
	src/mesa/shader/slang/slang_emit.c
	src/mesa/state_tracker/st_program.c
	src/mesa/state_tracker/wgl/stw_wgl.h
	src/mesa/state_tracker/wgl/stw_wgl_pixelformat.h
---

a3ee0aa1bb7c3f9dfc5b13b4e72522c10a22ad05