# HG changeset patch
# User Chris Cannam
# Date 1420652541 0
# Node ID e57bee4a6d74d3d11a5b58f4f54e7d20bf28c2a0
# Parent  b9e5e6d16e37be29e6c7e82d59b31289b5809eed# Parent  385bb7313bdbecc5e219b739a21bb6bb12734214
Merge from default branch

diff -r b9e5e6d16e37 -r e57bee4a6d74 .hgsubstate
--- a/.hgsubstate	Wed Jul 01 11:33:28 2015 +0100
+++ b/.hgsubstate	Wed Jan 07 17:42:21 2015 +0000
@@ -1,5 +1,5 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
-1020db1698c01ab04851fcb583e9e26a0bad7c1f svapp
-16574eea3229569733af0ce77db646366d8391e6 svcore
-aef8f6fff278455af22788498fc922c4a7d0dcdf svgui
+39ab248a49989ebecf87a072390b564f9306b7a1 svapp
+457a1a619c5fedf4591bca81ff58df0baa0bafc7 svcore
+2d4d0dbb94e3e6d7d0490df96473573c51f41c36 svgui