git.libre-soc.org Git - mesa.git/commit

author	Brian Paul <brianp@vmware.com>
	Mon, 9 Feb 2009 16:22:22 +0000 (09:22 -0700)
committer	Brian Paul <brianp@vmware.com>
	Mon, 9 Feb 2009 16:22:22 +0000 (09:22 -0700)
commit	e97681c7f551a2a2a6bd5eff0f4192a870c816c0
tree	dff2bf0e6d22efb92af131f64be0621ed316977c	tree
parent	1a46c8a062aea59de5cf55881104489db5d609e5	commit \| diff
parent	b907d4cd8fafe719b4f87d877562829548937485	commit \| diff

mesa: merge gallium-0.2 into gallium-master-merge

Merge commit 'origin/gallium-0.2' into gallium-master-merge

Conflicts:

Makefile
docs/relnotes-7.4.html
docs/relnotes.html
src/mesa/drivers/dri/i965/brw_wm.h
src/mesa/main/imports.c
src/mesa/main/mtypes.h
src/mesa/main/texcompress.c
src/mesa/main/texenvprogram.c
src/mesa/main/version.h
src/mesa/vbo/vbo_exec_api.c
src/mesa/vbo/vbo_save_draw.c

34 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
configs/autoconf.in	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
progs/demos/engine.c	diff1 \|	diff2 \|	blob \| history
src/glx/x11/glxclient.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/common/utils.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/common/utils.h	diff1 \|	diff2 \|	blob \| history
src/mesa/main/buffers.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/context.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/enable.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/extensions.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/fbobject.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/imports.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/imports.h	diff1 \|	diff2 \|	blob \| history
src/mesa/main/mtypes.h	diff1 \|	diff2 \|	blob \| history
src/mesa/main/renderbuffer.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/texcompress.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/texenvprogram.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/texformat.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/teximage.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/version.h	diff1 \|	diff2 \|	blob \| history
src/mesa/shader/arbprogparse.c	diff1 \|	diff2 \|	blob \| history
src/mesa/shader/prog_print.c	diff1 \|	diff2 \|	blob \| history
src/mesa/shader/prog_print.h	diff1 \|	diff2 \|	blob \| history
src/mesa/shader/prog_statevars.c	diff1 \|	diff2 \|	blob \| history
src/mesa/shader/shader_api.c	diff1 \|	diff2 \|	blob \| history
src/mesa/shader/slang/slang_link.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_fbo.c	\|	diff2 \|	blob \| history
src/mesa/state_tracker/st_draw.c	\|	diff2 \|	blob \| history
src/mesa/tnl/t_context.c	diff1 \|	diff2 \|	blob \| history
src/mesa/vbo/vbo_context.c	diff1 \|	diff2 \|	blob \| history
src/mesa/vbo/vbo_exec_api.c	diff1 \|	diff2 \|	blob \| history
src/mesa/vbo/vbo_exec_draw.c	diff1 \|	diff2 \|	blob \| history
src/mesa/vbo/vbo_save_draw.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

Makefile	diff1 \|	diff2 \|	blob \| history
configs/autoconf.in	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
progs/demos/engine.c	diff1 \|	diff2 \|	blob \| history
src/glx/x11/glxclient.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/common/utils.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/common/utils.h	diff1 \|	diff2 \|	blob \| history
src/mesa/main/buffers.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/context.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/enable.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/extensions.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/fbobject.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/imports.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/imports.h	diff1 \|	diff2 \|	blob \| history
src/mesa/main/mtypes.h	diff1 \|	diff2 \|	blob \| history
src/mesa/main/renderbuffer.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/texcompress.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/texenvprogram.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/texformat.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/teximage.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/version.h	diff1 \|	diff2 \|	blob \| history
src/mesa/shader/arbprogparse.c	diff1 \|	diff2 \|	blob \| history
src/mesa/shader/prog_print.c	diff1 \|	diff2 \|	blob \| history
src/mesa/shader/prog_print.h	diff1 \|	diff2 \|	blob \| history
src/mesa/shader/prog_statevars.c	diff1 \|	diff2 \|	blob \| history
src/mesa/shader/shader_api.c	diff1 \|	diff2 \|	blob \| history
src/mesa/shader/slang/slang_link.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_fbo.c	\|	diff2 \|	blob \| history
src/mesa/state_tracker/st_draw.c	\|	diff2 \|	blob \| history
src/mesa/tnl/t_context.c	diff1 \|	diff2 \|	blob \| history
src/mesa/vbo/vbo_context.c	diff1 \|	diff2 \|	blob \| history
src/mesa/vbo/vbo_exec_api.c	diff1 \|	diff2 \|	blob \| history
src/mesa/vbo/vbo_exec_draw.c	diff1 \|	diff2 \|	blob \| history
src/mesa/vbo/vbo_save_draw.c	diff1 \|	diff2 \|	blob \| history