Merge branch 'master' into stereo
authorJean-Marc Valin <Jean-Marc.Valin@csiro.au>
Mon, 26 Nov 2007 03:47:00 +0000 (14:47 +1100)
committerJean-Marc Valin <Jean-Marc.Valin@csiro.au>
Mon, 19 May 2008 06:14:15 +0000 (16:14 +1000)
commit9b09b8681342c3ab874c2c3f85a84227e3251e9d
treec3f4b11ade1d3334615122f525245f4e33111856
parent622aadef4c06d7a49ca8ef8f5a0f3fad2690daf5
parent30f2c34c35b3c4c50dec35a0686e998adc8eac64
Merge branch 'master' into stereo

Conflicts:

libspeex/mdf.c
include/speex/speex_echo.h
libspeex/mdf.c