diff .hgsubstate @ 1038:0f46daf55706 3.0-integration

Merge from default branch
author Chris Cannam
date Fri, 24 Jul 2015 16:31:54 +0100
parents afe496c595e1 2d524c9eee33
children e517197049bc
line wrap: on
line diff
--- a/.hgsubstate	Tue Jul 07 17:39:06 2015 +0100
+++ b/.hgsubstate	Fri Jul 24 16:31:54 2015 +0100
@@ -1,6 +1,6 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 06ed2d275a956fd1224376f74dfe170c19d3b2c2 icons/scalable
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
-1b4e5a567d5819afabbf4ec79647cf6e608e019b svapp
+85e7d2418d9acf74ffe27263f6245d8ea187f5a1 svapp
 e80abd6599224bd83dd96366c26a87b1b7175bd6 svcore
 b0662a3c4679c651616f02551d6173c318136a9c svgui