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

Merge branch 'mesa_7_7_branch'

Conflicts:

src/mesa/drivers/dri/i965/brw_wm_emit.c

progs/demos/fire.c	diff1 \|	diff2 \|	blob \| history
progs/fp/SConscript	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/tgsi/tgsi_sse2.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nv50/nv50_query.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/svga/svga_state_fs.c	diff1 \|	diff2 \|	blob \| history
src/mesa/Makefile	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/common/meta.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_wm_emit.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/r600/r600_texstate.c	diff1 \|	diff2 \|	blob \| history
src/mesa/shader/prog_optimize.c	diff1 \|	diff2 \|	blob \| history
src/mesa/tnl/t_vb_program.c	diff1 \|	diff2 \|	blob \| history