Merge branch 'mesa_7_5_branch'
authorJosé Fonseca <jfonseca@vmware.com>
Thu, 11 Jun 2009 15:34:56 +0000 (16:34 +0100)
committerJosé Fonseca <jfonseca@vmware.com>
Thu, 11 Jun 2009 15:34:56 +0000 (16:34 +0100)
commitbf89ecb6c92aaaeccd7b6f093cb8bae9fd56aaf6
treeb7b38a1e1bd5e975f77ec23ea872a97dc6963b64
parent0d2ac7a10b2904eda70794534a9a73b3f4b654cf
parentcc09724a50a4cabb68b7c5f5b8d3812d38f65391
Merge branch 'mesa_7_5_branch'

Conflicts:
src/mesa/state_tracker/st_cb_fbo.c
src/mesa/state_tracker/st_framebuffer.c
src/mesa/main/image.c
src/mesa/state_tracker/st_cb_fbo.c
src/mesa/state_tracker/st_cb_fbo.h
src/mesa/state_tracker/st_framebuffer.c