# HG changeset patch
# User Chris Cannam
# Date 1537189541 -3600
# Node ID 55d9bbf1fe45d8a30e0d66cd6361b020d6034f77
# Parent  246bdf94ef7bf3a8441468d01fdb9b013738a096# Parent  c6728590731926239bdc3651ccc6acedb6f8da30
Merge from default branch

diff -r c67285907319 -r 55d9bbf1fe45 main/main.cpp
--- a/main/main.cpp	Mon Sep 17 13:23:06 2018 +0100
+++ b/main/main.cpp	Mon Sep 17 14:05:41 2018 +0100
@@ -349,8 +349,9 @@
     // splash screen.
     PluginScan::getInstance()->scan();
     
-    // Permit size_t and PropertyName to be used as args in queued signal calls
+    // Permit these types to be used as args in queued signal calls
     qRegisterMetaType<PropertyContainer::PropertyName>("PropertyContainer::PropertyName");
+    qRegisterMetaType<ZoomLevel>("ZoomLevel");
 
     MainWindow::SoundOptions options = MainWindow::WithEverything;
     if (!audioOutput) options = 0;
diff -r c67285907319 -r 55d9bbf1fe45 repoint-lock.json
--- a/repoint-lock.json	Mon Sep 17 13:23:06 2018 +0100
+++ b/repoint-lock.json	Mon Sep 17 14:05:41 2018 +0100
@@ -4,10 +4,10 @@
       "pin": "da86fb0bccb3"
     },
     "svcore": {
-      "pin": "8988b27ebf38"
+      "pin": "710e6250a401"
     },
     "svgui": {
-      "pin": "8068a0bee550"
+      "pin": "13d9b422f7fe"
     },
     "svapp": {
       "pin": "9e15607531b2"
diff -r c67285907319 -r 55d9bbf1fe45 repoint-project.json
--- a/repoint-project.json	Mon Sep 17 13:23:06 2018 +0100
+++ b/repoint-project.json	Mon Sep 17 14:05:41 2018 +0100
@@ -16,11 +16,13 @@
         },
         "svcore": {
             "vcs": "hg",
-            "service": "soundsoftware"
+            "service": "soundsoftware",
+	    "branch": "zoom"
         },
         "svgui": {
             "vcs": "hg",
-            "service": "soundsoftware"
+            "service": "soundsoftware",
+	    "branch": "zoom"
         },
         "svapp": {
             "vcs": "hg",