diff .hgsubstate @ 1063:1f92fc7a6b05 3.0-integration

Merge from branch "recording"
author Chris Cannam
date Thu, 17 Sep 2015 13:46:20 +0100
parents 9918aaf0b790 d1d4f627d24e
children 4b212556dc54
line wrap: on
line diff
--- a/.hgsubstate	Thu Sep 17 13:29:31 2015 +0100
+++ b/.hgsubstate	Thu Sep 17 13:46:20 2015 +0100
@@ -1,9 +1,9 @@
-187d6a02a90e62f392b4ec6ca00947d346c9d6dc bqaudioio
+5f4dce69ab3eb1cbe38339f7320e9aea9568c369 bqaudioio
 62c40e7f9231e459091c3352c5d4b6001be127ca bqresample
 94b6ebd5e8ab897e5b294fd77b4113e8d6d78b13 bqvec
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 c6ca18292bfe9ba9bd67b0aa59320893f2954333 icons/scalable
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
-52c0aff69478e2fcb6a3ae9e7aaa56ee3f07c87a svapp
+111e976f9ed4cc78e552fa55a62b7532e5eb834d svapp
 2c43f99040689b482b52971b1edef6b697427f21 svcore
 8588b97f1d1c324a9d2c14e646b07fc00442172f svgui