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)
1  2 
src/gallium/auxiliary/util/u_gen_mipmap.c
src/gallium/auxiliary/util/u_tile.c

Simple merge