projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e617dd1 c4ce6f6)
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)
1  2 
src/mesa/state_tracker/st_cb_fbo.c patch | diff1 | diff2 | blob | history
src/mesa/state_tracker/st_cb_texture.c patch | diff1 | diff2 | blob | history

diff --cc src/mesa/state_tracker/st_cb_fbo.c
Simple merge