# HG changeset patch
# User Chris Cannam
# Date 1442494184 -3600
# Node ID 181ac43de5be0c2a5eb268eaba74292e46719553
# Parent  275aaa1207e898afdde77694e5e8f9f496e0f337# Parent  62870a9d207a40b9d509ff0c91fad92d6f86a393
Merge

diff -r 275aaa1207e8 -r 181ac43de5be .hgsubstate
--- a/.hgsubstate	Thu Sep 17 13:49:00 2015 +0100
+++ b/.hgsubstate	Thu Sep 17 13:49:44 2015 +0100
@@ -1,4 +1,4 @@
-187d6a02a90e62f392b4ec6ca00947d346c9d6dc bqaudioio
+5f4dce69ab3eb1cbe38339f7320e9aea9568c369 bqaudioio
 62c40e7f9231e459091c3352c5d4b6001be127ca bqresample
 442c2d44d61715d53c5a687422feaf52d1da6a10 bqvec
 456842723db65e5553e3506a8fedc8f21d9ea537 chp
@@ -6,6 +6,6 @@
 c6ca18292bfe9ba9bd67b0aa59320893f2954333 icons/scalable
 5c1572dd225a7fa23b520219ce4515961aafa7a5 pyin
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
-21d3cf5c8f210818c5d60a077a8e6b7e97b2ef3d svapp
+6eb28350050dd441e22a7bc8628e04aabeaecd45 svapp
 815f82508f9635a727d55ec2d32d70bea4f39c6e svcore
 477fbf3f10cac47bad2d5c4de3f72bb8b2361ae4 svgui