Merge branch 'develop' of aubio.org:/git/aubio/aubio into develop
authorPaul Brossier <piem@piem.org>
Sun, 10 Feb 2013 20:10:01 +0000 (15:10 -0500)
committerPaul Brossier <piem@piem.org>
Sun, 10 Feb 2013 20:10:01 +0000 (15:10 -0500)
commit947bbd3086f0c3189c0064ac61f643a516822a2d
tree65d46b136f37afcecd4c688eb0d9579c354b80d5
parentde836fd11313ffa449aeba9bdea32fec34853916
parentf360ad8a88de436dd0a2079fff89fa98a25359aa
Merge branch 'develop' of aubio.org:/git/aubio/aubio into develop