Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
authorNicolai Hähnle <nhaehnle@gmail.com>
Sun, 20 Sep 2009 14:59:03 +0000 (16:59 +0200)
committerNicolai Hähnle <nhaehnle@gmail.com>
Sun, 20 Sep 2009 14:59:03 +0000 (16:59 +0200)
commit82c2f7756af19f0a19aeda7ea1f627262e4561c0
tree3bb57b29ce8a2ca23de50746dd4dff63e9f653c6
parente617dd14ab4863921c02612ab76faa94b02a155c
parentc4ce6f6a7c124c62a8ee9bd9fba28fc69a38e18c
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
src/mesa/state_tracker/st_cb_fbo.c
src/mesa/state_tracker/st_cb_texture.c