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

diff -r 62870a9d207a -r 181ac43de5be .hgsubstate
--- a/.hgsubstate	Thu Sep 17 12:10:40 2015 +0100
+++ b/.hgsubstate	Thu Sep 17 13:49:44 2015 +0100
@@ -3,7 +3,7 @@
 442c2d44d61715d53c5a687422feaf52d1da6a10 bqvec
 456842723db65e5553e3506a8fedc8f21d9ea537 chp
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
-3777c7bf171aa4e8600fabbacf0cfb7c9b18aedc icons/scalable
+c6ca18292bfe9ba9bd67b0aa59320893f2954333 icons/scalable
 5c1572dd225a7fa23b520219ce4515961aafa7a5 pyin
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
 6eb28350050dd441e22a7bc8628e04aabeaecd45 svapp