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

Merge branch 'mesa_7_5_branch'

Conflicts:

Makefile
src/gallium/drivers/softpipe/sp_screen.c
src/mesa/main/version.h

docs/relnotes.html	diff1 \|	diff2 \|	blob \| history
scons/gallium.py	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/softpipe/sp_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/include/pipe/p_defines.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/intel/intel_context.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/mtypes.h	diff1 \|	diff2 \|	blob \| history
src/mesa/shader/shader_api.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_extensions.c	diff1 \|	diff2 \|	blob \| history