# HG changeset patch
# User Chris Cannam
# Date 1407255702 -3600
# Node ID 44d3e027d59273fd1c09ff496ab312edf667b985
# Parent  d104abdcdd694e819fc4985a4334148d35bc1e5a# Parent  14ff78c4fa42f45cc20b5b37cd166bc016c50296
Merge

diff -r d104abdcdd69 -r 44d3e027d592 .hgsub
--- a/.hgsub	Tue Aug 05 17:21:31 2014 +0100
+++ b/.hgsub	Tue Aug 05 17:21:42 2014 +0100
@@ -12,3 +12,4 @@
 nnls-chroma = https://code.soundsoftware.ac.uk/hg/nnls-chroma
 pyin = https://code.soundsoftware.ac.uk/hg/pyin
 silvet = https://code.soundsoftware.ac.uk/hg/silvet
+constant-q-cpp = https://code.soundsoftware.ac.uk/hg/constant-q-cpp
diff -r d104abdcdd69 -r 44d3e027d592 .hgsubstate
--- a/.hgsubstate	Tue Aug 05 17:21:31 2014 +0100
+++ b/.hgsubstate	Tue Aug 05 17:21:42 2014 +0100
@@ -1,3 +1,4 @@
+5d7203832660f2b429ab90c5140b5e7ebc93af7d constant-q-cpp
 fec395fcdc7c38589bac50541e5c6e19502d9eb6 match-vamp
 ca32a96c123a2c3f7548e37a8d5f4205632bdd9d mazurka-plugins
 90c2f0b597f8130c906ff3ea019480bc433d7db2 nnls-chroma