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)
commit6559eaef59526a7f4b2c22927637091018535c0c
treecaffa9fca6393dd04fa7f2622d00795f374b18c4
parent2655d437569c5bce7c56782792cbd4460b9f758b
parent2b83483fb43386bd4b8d199d371a3e513828695f
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
src/gallium/drivers/softpipe/sp_tex_sample.c
src/mesa/swrast/s_texfilter.c