changeset 2000:64dbd75b9296

Merge from branch import-audio-data
author Chris Cannam
date Wed, 12 Sep 2018 15:59:39 +0100
parents b316a89ec6a6 (diff) 417bf3d64215 (current diff)
children 5d3ef2c450cc
files repoint-lock.json repoint-project.json
diffstat 2 files changed, 6 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/repoint-lock.json	Wed Sep 12 15:43:12 2018 +0100
+++ b/repoint-lock.json	Wed Sep 12 15:59:39 2018 +0100
@@ -4,13 +4,13 @@
       "pin": "da86fb0bccb3"
     },
     "svcore": {
-      "pin": "2d291eac9f21"
+      "pin": "b7cb203ee344"
     },
     "svgui": {
-      "pin": "f33ee2702447"
+      "pin": "8068a0bee550"
     },
     "svapp": {
-      "pin": "22e455beee3b"
+      "pin": "9e15607531b2"
     },
     "checker": {
       "pin": "2e8a5f665a07"
--- a/repoint-project.json	Wed Sep 12 15:43:12 2018 +0100
+++ b/repoint-project.json	Wed Sep 12 15:59:39 2018 +0100
@@ -16,18 +16,15 @@
         },
         "svcore": {
             "vcs": "hg",
-            "service": "soundsoftware",
-            "branch": "import-audio-data"
+            "service": "soundsoftware"
         },
         "svgui": {
             "vcs": "hg",
-            "service": "soundsoftware",
-            "branch": "import-audio-data"
+            "service": "soundsoftware"
         },
         "svapp": {
             "vcs": "hg",
-	    "service": "soundsoftware",
-            "branch": "import-audio-data"
+	    "service": "soundsoftware"
         },
         "checker": {
             "vcs": "hg",