merge from develop
authorPaul Brossier <piem@piem.org>
Fri, 22 Mar 2013 18:31:06 +0000 (13:31 -0500)
committerPaul Brossier <piem@piem.org>
Fri, 22 Mar 2013 18:31:06 +0000 (13:31 -0500)
commit54a2ca2f34f36fd9fedb79b07575541a68eee65c
treee40ca9147502471c9c29b5ca2f65580509dd04cd
parentb712146c4cd22929e97320510e48d30e9145e9b4
parent59c4e5d37cb40cb0955859b29000ddfa9da73994
merge from develop
src/aubio.h