Merge branch 'mesa_7_5_branch'
authorBrian Paul <brianp@vmware.com>
Thu, 27 Aug 2009 15:14:09 +0000 (09:14 -0600)
committerBrian Paul <brianp@vmware.com>
Thu, 27 Aug 2009 15:14:09 +0000 (09:14 -0600)
commit44e86dde6dfe934acc0d50aad10e0f2cb390e47b
treea5be3772dc9aacb76771e782cb0266257bfc796a
parent8d0bdfa4335ea07a747f53635a57414d15c234b7
parent32f95f8c173155ca30e77c345a68b0d3336ddbed
Merge branch 'mesa_7_5_branch'
src/gallium/auxiliary/util/u_gen_mipmap.c
src/gallium/auxiliary/util/u_tile.c