# HG changeset patch # User Chris Cannam # Date 1525357483 -3600 # Node ID 75be1cb2f3c18bc7ed08efcbf9c7d240cb7d66e5 # Parent bea6e7bced2538bb1660e4700260e7c92c1b0eb7# Parent 2613d459f90ba55154502b54077ae8cd81ef0447 Merge from branch horizontal-scale diff -r bea6e7bced25 -r 75be1cb2f3c1 vext-lock.json --- 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" diff -r bea6e7bced25 -r 75be1cb2f3c1 vext-project.json --- 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",