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

author	Brian Paul <brianp@vmware.com>
	Wed, 24 Jun 2009 14:54:37 +0000 (08:54 -0600)
committer	Brian Paul <brianp@vmware.com>
	Wed, 24 Jun 2009 14:54:37 +0000 (08:54 -0600)
commit	a04af335a42ce3b28e59ff9b85b2bd433a9d7b12
tree	768262f4e8e4a9f49c64b76882c48f1ede445dd5	tree
parent	d60b2c68552a2729dfdb33c2bac4822453cf8ae2	commit \| diff
parent	c25534f30d326c15dff845775d9bd55ba6064049	commit \| diff

Merge branch 'mesa_7_5_branch'

Conflicts:

src/mesa/drivers/dri/i915/i915_tex_layout.c
src/mesa/drivers/dri/i965/brw_wm_glsl.c
src/mesa/drivers/dri/intel/intel_buffer_objects.c
src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
src/mesa/drivers/dri/intel/intel_pixel_draw.c
src/mesa/main/enums.c
src/mesa/main/texstate.c
src/mesa/vbo/vbo_exec_array.c

RSS Atom

src/gallium/state_trackers/glx/xlib/fakeglx.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/intel/intel_buffer_objects.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/intel/intel_pixel_draw.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/r300/r300_context.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/context.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/enums.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/mipmap.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/mtypes.h	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_framebuffer.c	diff1 \|	diff2 \|	blob \| history