changeset 1358:5b639a383e58 3.0-integration

Merge from branch subdivide-instants
author Chris Cannam
date Fri, 25 Nov 2016 10:08:52 +0000
parents ae68ebb5fbe8 (diff) 78d2cb5f2cad (current diff)
children ffc3daf092dd
files .hgsubstate
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Fri Nov 25 10:08:09 2016 +0000
+++ b/.hgsubstate	Fri Nov 25 10:08:52 2016 +0000
@@ -7,7 +7,7 @@
 68ae618c6b0e442d08a71d39217784a08f2a8de3 icons/scalable
 3257ddb6fff110cc88f3ffeaeefa0f29d5eb3b6f piper-cpp
 e1712f7d74a455337591091a57beba2f0443b9dd sv-dependency-builds
-287fce13a1aefc604e88f34a355ede7dc8306187 svapp
-114de081a42d894400dbdcf4945d578b4c7dc8a3 svcore
+630c4a9885cac11c40ee4907f4e7cde612a8e988 svapp
+3cde25cbe7f8d04de0b3668463b98f2b796247d1 svcore
 958e352919a587f0e9702b0d43f5667b8167e71c svgui
 0eebd22a081a824067bf3d5de65326696feab653 vamp-plugin-sdk