# HG changeset patch
# User Chris Cannam
# Date 1478009337 0
# Node ID a5db0b13aa25802a4e8a2513679c87998cb2a69c
# Parent  6e47bd2263e28716aaec9009583b9329032a073c# Parent  e93ad534c1cb2adb67326f12787618b8db7f499f
Merge from branch 3.0-integration

diff -r e93ad534c1cb -r a5db0b13aa25 .hgsubstate
--- a/.hgsubstate	Tue Nov 01 14:06:47 2016 +0000
+++ b/.hgsubstate	Tue Nov 01 14:08:57 2016 +0000
@@ -6,7 +6,7 @@
 68ae618c6b0e442d08a71d39217784a08f2a8de3 icons/scalable
 bcfadce0b8acf66565fadfe50f3aaffbeb6e5c1c piper-cpp
 e1712f7d74a455337591091a57beba2f0443b9dd sv-dependency-builds
-e59e66d8208d89f38c8cfda0a29cdda48056b32d svapp
-c6bdf247016a9f264a05082f9725b93171d17dac svcore
+9d067d65fe3f94033f5e4c80fc2f4475d484f556 svapp
+c401e738793f2de89d7b63a7948c7831966a44e6 svcore
 8a5f0c8d56089170062e94c70f369292b06a6c12 svgui
 79a219ba617862adffd78925f1571e5c96760e0a vamp-plugin-sdk