Merge branch 'mesa_7_6_branch'
authorBrian Paul <brianp@vmware.com>
Sun, 20 Sep 2009 16:36:45 +0000 (10:36 -0600)
committerBrian Paul <brianp@vmware.com>
Sun, 20 Sep 2009 16:36:45 +0000 (10:36 -0600)
commitebf2710b2fd21ae9a6604c015ca7a948589f5a8c
treedd6b9da40b44824a1a4bdcfb4b3b2fc7edef3233
parented4076b5b8c5d3c024e291f42a8730b4f71226c9
parent82c2f7756af19f0a19aeda7ea1f627262e4561c0
Merge branch 'mesa_7_6_branch'

Conflicts:
src/mesa/drivers/dri/intel/intel_clear.c
src/mesa/drivers/common/meta.c
src/mesa/state_tracker/st_cb_texture.c