Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
authorBrian Paul <brianp@vmware.com>
Mon, 28 Sep 2009 15:59:59 +0000 (09:59 -0600)
committerBrian Paul <brianp@vmware.com>
Mon, 28 Sep 2009 15:59:59 +0000 (09:59 -0600)
commiteeb7e04da64fdae3a40b1afdcde71dcded2481f3
treed968a71505b92c86a78b435f72752884a9435f92
parent151e0c0aeaa78f4eb6a87d2b3dd86b4807db1523
parentd09941c8cc2d4620eb774744c8878921b9dc3bcc
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
src/gallium/auxiliary/util/u_gen_mipmap.c
src/mesa/drivers/dri/intel/intel_buffer_objects.c
src/mesa/state_tracker/st_cb_texture.c