# HG changeset patch
# User Chris Cannam
# Date 1542205718 0
# Node ID 903537249fdf0d7b001a5543315b26f5a733c8b1
# Parent  939cfabca86a612426b4396ed73a34354573e42d# Parent  a63b409e31702d2a1426e0d56b8c266386417804
Merge from branch spectrogramparam

diff -r a63b409e3170 -r 903537249fdf repoint-lock.json
--- a/repoint-lock.json	Wed Nov 14 14:17:29 2018 +0000
+++ b/repoint-lock.json	Wed Nov 14 14:28:38 2018 +0000
@@ -4,10 +4,10 @@
       "pin": "da86fb0bccb3"
     },
     "svcore": {
-      "pin": "0f62bce0f0be"
+      "pin": "50fe6d6a5ef0"
     },
     "svgui": {
-      "pin": "4a36f6130056"
+      "pin": "32bbb86094c3"
     },
     "svapp": {
       "pin": "29bef008588e"
diff -r a63b409e3170 -r 903537249fdf repoint-project.json
--- a/repoint-project.json	Wed Nov 14 14:17:29 2018 +0000
+++ b/repoint-project.json	Wed Nov 14 14:28:38 2018 +0000
@@ -16,13 +16,11 @@
         },
         "svcore": {
             "vcs": "hg",
-            "service": "soundsoftware",
-            "branch": "spectrogramparam"
+            "service": "soundsoftware"
         },
         "svgui": {
             "vcs": "hg",
-            "service": "soundsoftware",
-            "branch": "spectrogramparam"
+            "service": "soundsoftware"
         },
         "svapp": {
             "vcs": "hg",