projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2655d43 2b83483)
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
authorBrian Paul <brianp@vmware.com>
Mon, 21 Sep 2009 20:49:46 +0000 (14:49 -0600)
committerBrian Paul <brianp@vmware.com>
Mon, 21 Sep 2009 20:49:46 +0000 (14:49 -0600)
1  2 
src/gallium/drivers/softpipe/sp_tex_sample.c patch | diff1 | diff2 | blob | history
src/mesa/swrast/s_texfilter.c patch | diff1 | diff2 | blob | history

diff --cc src/mesa/swrast/s_texfilter.c
Simple merge