Merge branch 'develop' of 192.168.1.16:projects/aubio/aubio into develop
authorPaul Brossier <piem@piem.org>
Sun, 15 Jul 2012 22:31:07 +0000 (16:31 -0600)
committerPaul Brossier <piem@piem.org>
Sun, 15 Jul 2012 22:31:07 +0000 (16:31 -0600)
commit17fc762ee9053ce357db49bcb11e01696bbadea9
tree118869fda0d6b03d4792f77f44f9b870d7f1bb62
parent9ccd89fae4ed7a7975483fa5fd6001dc8388f826
parentfd70e5e5113372c73cde7945107d7c7ae7f75f39
Merge branch 'develop' of 192.168.1.16:projects/aubio/aubio into develop