Merge branch 'develop' into notes
authorPaul Brossier <piem@piem.org>
Sat, 5 Sep 2015 10:27:38 +0000 (12:27 +0200)
committerPaul Brossier <piem@piem.org>
Sat, 5 Sep 2015 10:27:38 +0000 (12:27 +0200)
1  2 
src/aubio.h

diff --cc src/aubio.h
Simple merge