Merge branch 'develop' of aubio.org:/git/aubio/aubio into develop
authorPaul Brossier <piem@piem.org>
Fri, 22 Apr 2016 14:39:05 +0000 (16:39 +0200)
committerPaul Brossier <piem@piem.org>
Fri, 22 Apr 2016 14:39:05 +0000 (16:39 +0200)
1  2 
Makefile

diff --cc Makefile
Simple merge