# HG changeset patch
# User Chris Cannam
# Date 1435768985 -3600
# Node ID 1b7c6db542dace75d228709dbbf9739376a54c09
# Parent  5b42fbe07063d3c25386d585662968d4f4686f5a# Parent  8feac10dbdb46da3d4e60d237848db247295eeee
Merge

diff -r 8feac10dbdb4 -r 1b7c6db542da .hgsubstate
--- a/.hgsubstate	Wed Jul 01 18:31:28 2015 +0100
+++ b/.hgsubstate	Wed Jul 01 17:43:05 2015 +0100
@@ -1,5 +1,5 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
-03ad9c0eb6ed8336deb93ae37bae27a7f31d4e7e icons/scalable
+06ed2d275a956fd1224376f74dfe170c19d3b2c2 icons/scalable
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
 1b4e5a567d5819afabbf4ec79647cf6e608e019b svapp
 4d7de68707c8f1b47695f65c3a95eba4557de6aa svcore