# HG changeset patch # User Chris Cannam # Date 1536764379 -3600 # Node ID 64dbd75b9296d779aeebef40d697faa0d337c134 # Parent b316a89ec6a61b634ce3a5dcfd6075ac7231889b# Parent 417bf3d64215d4da2bbe0f3c801cc58b18fbb4b3 Merge from branch import-audio-data diff -r 417bf3d64215 -r 64dbd75b9296 repoint-lock.json --- 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" diff -r 417bf3d64215 -r 64dbd75b9296 repoint-project.json --- 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",