diff .hgsubstate @ 1439:3e77e9ecc520 3.0-integration

Merge from branch levelpanwidget
author Chris Cannam
date Thu, 15 Dec 2016 16:13:16 +0000
parents 2879f30ae067
children 590b81c7ebd4
line wrap: on
line diff
--- a/.hgsubstate	Thu Dec 15 08:58:43 2016 +0000
+++ b/.hgsubstate	Thu Dec 15 16:13:16 2016 +0000
@@ -4,10 +4,10 @@
 dca061781357caf0500b89ccf73d8801de5d2636 bqvec
 1eefc20919cd080b684b2bbbc0af7270b8facb54 checker
 3768bdde6fdf866aa63fff5bde8d9fa64a8979ef dataquay
-9b913ebff56264e6a10bef85a3f36a271ccab40a icons/scalable
+7d46098431f39c265e47254e420576559587b3fe icons/scalable
 3257ddb6fff110cc88f3ffeaeefa0f29d5eb3b6f piper-cpp
 5f67a29f0fc7f1b908f7cde4866173a7af337862 sv-dependency-builds
-ce3818cd16c578fb40dd2d30f2c94090026582aa svapp
-5b04b8bc88ca83b0951ab4a0da6a960c1288c385 svcore
-f32828ea63d9d7fa18ccdd44822960735b2adc9b svgui
+be83e81d915603712fb32b434f19945b7694811b svapp
+491a992f856ead12337fa66012590d335eed0140 svcore
+54e6be7ebe11c78ce4cd46ffdff35c05689dc1f8 svgui
 0eebd22a081a824067bf3d5de65326696feab653 vamp-plugin-sdk