Mercurial > hg > sonic-visualiser
changeset 1804:75be1cb2f3c1
Merge from branch horizontal-scale
author | Chris Cannam |
---|---|
date | Thu, 03 May 2018 15:24:43 +0100 (2018-05-03) |
parents | bea6e7bced25 (current diff) 2613d459f90b (diff) |
children | cdba78a6f51a |
files | vext-lock.json |
diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/vext-lock.json Wed May 02 14:32:01 2018 +0100 +++ b/vext-lock.json Thu May 03 15:24:43 2018 +0100 @@ -4,10 +4,10 @@ "pin": "8742125177ae" }, "svcore": { - "pin": "0fb5d4e6edeb" + "pin": "45519a9836e6" }, "svgui": { - "pin": "3ca1be2e2c91" + "pin": "f90a3c2f2930" }, "svapp": { "pin": "f03bc1d38cac"
--- a/vext-project.json Wed May 02 14:32:01 2018 +0100 +++ b/vext-project.json Thu May 03 15:24:43 2018 +0100 @@ -16,11 +16,13 @@ }, "svcore": { "vcs": "hg", - "service": "soundsoftware" + "service": "soundsoftware", + "branch": "horizontal-scale" }, "svgui": { "vcs": "hg", - "service": "soundsoftware" + "service": "soundsoftware", + "branch": "horizontal-scale" }, "svapp": { "vcs": "hg",