Merge branch 'mesa_7_6_branch'
authorBrian Paul <brianp@vmware.com>
Mon, 5 Oct 2009 20:42:08 +0000 (14:42 -0600)
committerBrian Paul <brianp@vmware.com>
Mon, 5 Oct 2009 20:42:08 +0000 (14:42 -0600)
commit55770d09c18c4d33403abb97dfef4f897efbbe2a
tree3f3cb2ea42c511c11e134c2d414367df82268cea
parentf00da2a3ff59c1a7104ac25a1c6eba5a6050ad68
parent79892e7976fbb91ae426f5868d5f453e977c1f17
Merge branch 'mesa_7_6_branch'

Conflicts:

src/gallium/auxiliary/util/u_cpu_detect.c
12 files changed:
src/gallium/auxiliary/draw/draw_pt_post_vs.c
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/gallium/drivers/softpipe/sp_fs_sse.c
src/mesa/drivers/dri/intel/intel_context.c
src/mesa/drivers/dri/intel/intel_pixel_read.c
src/mesa/drivers/dri/intel/intel_tex_copy.c
src/mesa/drivers/dri/r300/r300_context.c
src/mesa/main/context.c
src/mesa/main/dlist.c
src/mesa/main/texobj.c
src/mesa/state_tracker/st_cb_drawpixels.c
src/mesa/state_tracker/st_cb_fbo.c