changeset 37:5ae8d8a1e411

Merge
author Chris Cannam
date Wed, 06 Aug 2014 16:31:51 +0100
parents 56eff3575b55 (current diff) 86bb97521df4 (diff)
children 12d422dd6992
files .hgsubstate
diffstat 1 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Wed Aug 06 16:30:34 2014 +0100
+++ b/.hgsubstate	Wed Aug 06 16:31:51 2014 +0100
@@ -1,15 +1,15 @@
-870077df3318592492aaa178d20d7d581a7c8f8f constant-q-cpp
-6ea008aa881763587a08aa8d46d3cca799aa5686 match-vamp
+73186ff0e8eb86acbafd0f5c2d5ceacd760e57d0 constant-q-cpp
+acc12b4d54b4ff19eac66c64749d6afb01d1e1e7 match-vamp
 ca32a96c123a2c3f7548e37a8d5f4205632bdd9d mazurka-plugins
-3226fe4e1280454e2de12a961b3fa43518834de3 nnls-chroma
-564f80bc0da4ab7778779ab08d883fff350cecad pyin
-93c8ebc0c2ef4db89d8a1e2d61bca15f9ff088ff qm-vamp-plugins
-4cc12d2d64e47b72122320f5e165b0b534811f24 segmenter-vamp-plugin
+6408759460777522101d3310de8e6852a1a1af61 nnls-chroma
+00cffb79d0e0d84e63914c0079601145fa6997ae pyin
+df9b98c6baf8766b52a16c15ee50b11837c0a599 qm-vamp-plugins
+6b23b827b108103ae9d1f412dc6c282a21302520 segmenter-vamp-plugin
 8e94604ccff2588cfb8f3e32de21405a5440af18 silvet
 b835875739968beb870e7e09132aa361656a8a30 vamp-aubio-plugins
 81146373f024be1c82371f04262cf2ae1680cb61 vamp-libxtract-plugins
 8bc4ec815b6b695371dc9dda500191892ca5d2a7 vamp-onsetsds-plugin
-2056dfdd42c61acb70fca53002bd279063c3c499 vamp-plugin-sdk
+7284eef3c4efe4ae9829709c09d8809eba954ca1 vamp-plugin-sdk
 929b95cd25b1f421d0495487ed65fc40e2d37cbc vamp-plugin-tester
-886d1071c282201f67504690ea6476417193db18 vamp-test-plugin
-4ffac7dedddfbbdffc18f74a71c05e8e0f88bd67 vampy
+bc66d4d9c8f204fdb844aee96668aebbd78809bb vamp-test-plugin
+0df94e3f0fdb6eac02860655503e242a86cbb671 vampy