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

projects / mesa.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: bfc34c8 6d84580)

author	Brian Paul <brianp@vmware.com>
	Tue, 5 Jan 2010 02:16:24 +0000 (19:16 -0700)
committer	Brian Paul <brianp@vmware.com>
	Tue, 5 Jan 2010 02:16:24 +0000 (19:16 -0700)
commit	5ac16495a2772886100789f04e1a7d65068e9a40
tree	3a387294b977841ac4255ff8fbfedd1ce2dc8946	tree
parent	bfc34c880492f15dc47db30e88f888d1c48d5e70	commit \| diff
parent	6d845808589b9df84f23551b122533a55dce6bd5	commit \| diff

Merge branch 'mesa_7_7_branch'

Conflicts:
docs/relnotes.html
src/gallium/drivers/llvmpipe/lp_tex_sample_c.c
src/gallium/drivers/r300/r300_cs.h
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
src/mesa/main/enums.c

15 files changed:

docs/relnotes.html	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r300/r300_emit.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r300/r300_reg.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/svga/svga_context.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/svga/svga_pipe_vs.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/svga/svga_state_vs.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/xorg/xorg_crtc.c	diff1 \|	diff2 \|	blob \| history
src/gallium/winsys/drm/vmware/xorg/SConscript	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i915/i915_texstate.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_wm_surface_state.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/attrib.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/enums.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/image.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_texture.c	diff1 \|	diff2 \|	blob \| history
src/mesa/x86/gen_matypes.c	diff1 \|	diff2 \|	blob \| history