# HG changeset patch
# User Chris Cannam
# Date 1436287146 -3600
# Node ID afe496c595e1f585edb0b0fcd7844ec855c568b0
# Parent  1b7c6db542dace75d228709dbbf9739376a54c09# Parent  14e312cf8e951ed5bd2b86c55cc73bbea458c707
Merge from default branch

diff -r 1b7c6db542da -r afe496c595e1 .hgsubstate
--- a/.hgsubstate	Wed Jul 01 17:43:05 2015 +0100
+++ b/.hgsubstate	Tue Jul 07 17:39:06 2015 +0100
@@ -2,5 +2,5 @@
 06ed2d275a956fd1224376f74dfe170c19d3b2c2 icons/scalable
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
 1b4e5a567d5819afabbf4ec79647cf6e608e019b svapp
-4d7de68707c8f1b47695f65c3a95eba4557de6aa svcore
-2adca8f05583809e64cbb1486ab2f58bff49c784 svgui
+e80abd6599224bd83dd96366c26a87b1b7175bd6 svcore
+b0662a3c4679c651616f02551d6173c318136a9c svgui