diff .hgsubstate @ 1462:f5180edc5dda 3.0-integration

Merge
author Chris Cannam <cannam@all-day-breakfast.com>
date Tue, 03 Jan 2017 14:34:46 +0000
parents 8ca62b402846
children f5c828d1f3e2
line wrap: on
line diff
--- a/.hgsubstate	Tue Jan 03 14:32:53 2017 +0000
+++ b/.hgsubstate	Tue Jan 03 14:34:46 2017 +0000
@@ -6,7 +6,7 @@
 3768bdde6fdf866aa63fff5bde8d9fa64a8979ef dataquay
 7d46098431f39c265e47254e420576559587b3fe icons/scalable
 3257ddb6fff110cc88f3ffeaeefa0f29d5eb3b6f piper-cpp
-5f67a29f0fc7f1b908f7cde4866173a7af337862 sv-dependency-builds
+284acf908dcd9f5bdaf805a7f5aeaac1764b4604 sv-dependency-builds
 022d6a9e6d75f77a693d31765faead2e578cf014 svapp
 47768571681e9ef5a14dbfd066b7a1510580c53e svcore
 67f437277069ed83664691fc179421fdbfe9ad70 svgui