changeset 1452:b9898dd955b8 3.0-integration

Merge from branch svg, and thus (in some subrepos) from levelpanwidget
author Chris Cannam
date Mon, 19 Dec 2016 16:34:38 +0000
parents c8b03c666185 (diff) e4f223fc9099 (current diff)
children a9448d12d792
files .hgsubstate
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Mon Dec 19 16:32:34 2016 +0000
+++ b/.hgsubstate	Mon Dec 19 16:34:38 2016 +0000
@@ -7,7 +7,7 @@
 7d46098431f39c265e47254e420576559587b3fe icons/scalable
 3257ddb6fff110cc88f3ffeaeefa0f29d5eb3b6f piper-cpp
 5f67a29f0fc7f1b908f7cde4866173a7af337862 sv-dependency-builds
-b777379e70d851aa75ff66b677fb3bd4c79808d4 svapp
-b1a7f45544003003008ee5098628fc009771c5dc svcore
-6828735468c9f096e02a3dfa67a6529876741f69 svgui
+022d6a9e6d75f77a693d31765faead2e578cf014 svapp
+46670bb4a2900220902ddc8e784ca6216902638f svcore
+ff042979331b9f3cd758f0f98f9ad222fbb6e9f6 svgui
 0eebd22a081a824067bf3d5de65326696feab653 vamp-plugin-sdk