Merge branch 'master' into pitchshift
authorPaul Brossier <piem@piem.org>
Fri, 23 Sep 2016 04:57:20 +0000 (06:57 +0200)
committerPaul Brossier <piem@piem.org>
Fri, 23 Sep 2016 04:57:20 +0000 (06:57 +0200)
1  2 
python/lib/moresetuptools.py
src/aubio.h
wscript

Simple merge
diff --cc src/aubio.h
Simple merge
diff --cc wscript
Simple merge