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

author	Brian Paul <brianp@vmware.com>
	Wed, 9 Sep 2009 14:33:39 +0000 (08:33 -0600)
committer	Brian Paul <brianp@vmware.com>
	Wed, 9 Sep 2009 14:33:39 +0000 (08:33 -0600)
commit	0c309bb494b6ee1c403442d1207743f749f95b6e
tree	a3cb118c850ef4152312e81afdb7543f45ef2e3e	tree
parent	c6c44bf48124dd5b4661014a8d58482c5a54557f	commit \| diff
parent	d27d659043bd7f2bd9a2636209f299cda0664230	commit \| diff

Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

Conflicts:

Makefile
configs/default
progs/glsl/Makefile
src/gallium/auxiliary/util/u_simple_shaders.c
src/gallium/state_trackers/glx/xlib/xm_api.c
src/mesa/drivers/dri/i965/brw_draw_upload.c
src/mesa/drivers/dri/i965/brw_vs_emit.c
src/mesa/drivers/dri/intel/intel_context.h
src/mesa/drivers/dri/intel/intel_pixel.c
src/mesa/drivers/dri/intel/intel_pixel_read.c
src/mesa/main/texenvprogram.c
src/mesa/main/version.h

RSS Atom

src/gallium/auxiliary/util/u_simple_shaders.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_context.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_draw.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_draw_upload.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/intel/intel_pixel_read.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/intel/intel_regions.c	diff1 \|	diff2 \|	blob \| history