Merge commit 'origin/gallium-0.1'
authorJosé Fonseca <jfonseca@vmware.com>
Mon, 23 Feb 2009 17:21:36 +0000 (17:21 +0000)
committerJosé Fonseca <jfonseca@vmware.com>
Mon, 23 Feb 2009 17:21:36 +0000 (17:21 +0000)
commit37f21fce3bd323c361291215edeb7d8cf5f4335b
tree2909c90da7bff47ba359d50bde242b79a632210b
parent7399d56ec6019e00297eef57f802a53698baa8ad
parent60e35ebf1476c31eb5d7c207ab8e9db77fcad896
Merge commit 'origin/gallium-0.1'

Conflicts:
src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
src/gallium/auxiliary/util/u_tile.c
scons/gallium.py
scons/generic.py
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.h
src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c
src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
src/gallium/auxiliary/util/u_tile.c