Merge branch 'gallium-texture-transfer'
authorMichel Dänzer <daenzer@vmware.com>
Wed, 18 Feb 2009 15:43:02 +0000 (16:43 +0100)
committerMichel Dänzer <daenzer@vmware.com>
Wed, 18 Feb 2009 15:43:02 +0000 (16:43 +0100)
commit3bd7c5ceffc88a052c5e8e114df2f2c7549ddb4a
treebdb352609c3ef21875a2699428e26b8c8c930f73
parent76d8951fd3adbb91b2f71d461eec0f304619ca0b
parentb89aa1d87ad6cebdbb3f2067863c600f50bf0ff1
Merge branch 'gallium-texture-transfer'

Conflicts:
src/gallium/drivers/softpipe/sp_tile_cache.c
src/gallium/auxiliary/util/u_debug.c
src/gallium/auxiliary/util/u_gen_mipmap.c
src/gallium/drivers/softpipe/sp_tile_cache.c
src/gallium/winsys/xlib/xlib_brw_aub.c