Merge remote branch 'origin/mesa_7_6_branch'
authorEric Anholt <eric@anholt.net>
Fri, 23 Oct 2009 21:19:52 +0000 (14:19 -0700)
committerEric Anholt <eric@anholt.net>
Fri, 23 Oct 2009 22:21:05 +0000 (15:21 -0700)
commit49d402e275cdaf46de8db5a475dfe00509141195
treee5d17e8b69c1c0c8e96b43b70d8fcb09d077c942
parentbfd51dc34d45ba584683c70b1f854a513d9104d3
parent2d17dbfb5346b6d75e87c839148cbe125bf5cd6d
Merge remote branch 'origin/mesa_7_6_branch'

Conflicts:
src/mesa/drivers/dri/intel/intel_fbo.c
src/mesa/drivers/dri/intel/intel_mipmap_tree.c
src/mesa/drivers/dri/intel/intel_mipmap_tree.h
src/mesa/drivers/dri/intel/intel_tex_copy.c
src/mesa/drivers/dri/intel/intel_tex_image.c
src/mesa/drivers/dri/intel/intel_blit.c
src/mesa/drivers/dri/intel/intel_fbo.c
src/mesa/drivers/dri/intel/intel_mipmap_tree.c
src/mesa/drivers/dri/intel/intel_tex_copy.c
src/mesa/drivers/dri/intel/intel_tex_image.c
src/mesa/shader/program_parse.tab.c
src/mesa/shader/program_parse.y