Merge remote branch 'origin/mesa_7_7_branch'
authorJosé Fonseca <jfonseca@vmware.com>
Wed, 6 Jan 2010 13:52:22 +0000 (13:52 +0000)
committerJosé Fonseca <jfonseca@vmware.com>
Wed, 6 Jan 2010 13:52:22 +0000 (13:52 +0000)
commite32487b8a13a9efabb0359a9dde33e074e905e82
treefbfdb33273371a5faec1de4ff97b803766eacf63
parentaaf7ecfd816f82fef314f4f772cc53bc0ced553e
parent5b64d94390e4805e1634f0c8b5e3156e12b8b872
Merge remote branch 'origin/mesa_7_7_branch'

Conflicts:
configs/default
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/mesa/main/version.h
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/gallium/drivers/svga/svga_context.h
src/gallium/drivers/svga/svga_pipe_vs.c
src/gallium/drivers/svga/svga_state_vs.c
src/mesa/state_tracker/st_mesa_to_tgsi.c