Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
authorIan Romanick <ian.d.romanick@intel.com>
Tue, 15 Dec 2009 20:38:01 +0000 (12:38 -0800)
committerIan Romanick <ian.d.romanick@intel.com>
Tue, 15 Dec 2009 20:38:01 +0000 (12:38 -0800)
commit11522b74b318db9d099466ff226124c23595e8e2
tree2f57b1d594a9f6c223b002f1c549ea5f799b37cc
parentb90f7f3ad324b1e4c39e334cdeb9556c3eb808ab
parentf23d01e726a57cd6b8e31f1049ee5853773df7ea
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

Conflicts:
src/gallium/drivers/softpipe/sp_quad_blend.c
src/gallium/winsys/drm/intel/gem/intel_drm_api.c
src/gallium/winsys/xlib/Makefile
src/mesa/drivers/dri/intel/intel_buffers.c
src/mesa/state_tracker/st_draw.c
src/mesa/swrast/s_triangle.c