diff .hgsubstate @ 1027:1b7c6db542da 3.0-integration

Merge
author Chris Cannam
date Wed, 01 Jul 2015 17:43:05 +0100
parents 5b42fbe07063 8feac10dbdb4
children afe496c595e1
line wrap: on
line diff
--- a/.hgsubstate	Wed Jul 01 16:18:00 2015 +0100
+++ b/.hgsubstate	Wed Jul 01 17:43:05 2015 +0100
@@ -1,6 +1,6 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 06ed2d275a956fd1224376f74dfe170c19d3b2c2 icons/scalable
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
-83370e830c956be0fc4a7d9b5c30761b6ffb7613 svapp
-a65328f0c45067b31d55cdf4b0aa97f646bab37d svcore
-4f4f0e158ecf5e7ebeef8ba72023c70ccbdb92e7 svgui
+1b4e5a567d5819afabbf4ec79647cf6e608e019b svapp
+4d7de68707c8f1b47695f65c3a95eba4557de6aa svcore
+2adca8f05583809e64cbb1486ab2f58bff49c784 svgui