diff .hgsubstate @ 1390:4c5533df5d72 levelpanwidget

Merge from branch 3.0-integration
author Chris Cannam
date Mon, 05 Dec 2016 17:03:09 +0000
parents 05d35ce6ea72 032bf0b11de9
children a49b1cbedb5f
line wrap: on
line diff
--- a/.hgsubstate	Mon Dec 05 15:47:40 2016 +0000
+++ b/.hgsubstate	Mon Dec 05 17:03:09 2016 +0000
@@ -7,7 +7,7 @@
 5359bc0783c637ba486a335fbc6757e64f4e83ac icons/scalable
 3257ddb6fff110cc88f3ffeaeefa0f29d5eb3b6f piper-cpp
 5f67a29f0fc7f1b908f7cde4866173a7af337862 sv-dependency-builds
-fb675409297a97468a96c703ee9fa378575c52a6 svapp
-a421e752d22c71a9cd55db40a62f053f61d9ce57 svcore
+fcac6c6b8deb3c78c4c453b4271a198775bd71d7 svapp
+ea28ee929034977f941b9713e82583fc3d9b1312 svcore
 916b62baf7ac87aa5cd2db9c26b51fdefddfc897 svgui
 0eebd22a081a824067bf3d5de65326696feab653 vamp-plugin-sdk