Merge branch 'mesa_7_6_branch'
authorBrian Paul <brianp@vmware.com>
Wed, 23 Sep 2009 17:00:04 +0000 (11:00 -0600)
committerBrian Paul <brianp@vmware.com>
Wed, 23 Sep 2009 17:00:04 +0000 (11:00 -0600)
commitde25f82067bca5231fb968190f6c12cb517d62ff
tree3575e6e6252b40bd1d2070e81b5a1c0fc9b8300d
parent890679d4322e7ba4f12f32532a3fdd277edff886
parente41707becaffd604fedc885719e5b061a4a5b363
Merge branch 'mesa_7_6_branch'

Conflicts:

src/gallium/drivers/softpipe/sp_tile_cache.c
src/gallium/drivers/softpipe/sp_tex_tile_cache.h
src/gallium/drivers/softpipe/sp_tile_cache.c
src/gallium/drivers/softpipe/sp_tile_cache.h