# HG changeset patch
# User Chris Cannam
# Date 1493968750 -3600
# Node ID 6ad57ce693cb3d8e85de4b0ce0ec9746f33ef350
# Parent  0f389bfb0905974ace4853b28e2b5a54cafe9bac# Parent  5323074dda37d195e3ed6046ebb629d068d1183c
Merge from branch scale-ticks

diff -r 0f389bfb0905 -r 6ad57ce693cb .hgsubstate
--- a/.hgsubstate	Mon Apr 24 09:07:26 2017 +0100
+++ b/.hgsubstate	Fri May 05 08:19:10 2017 +0100
@@ -8,6 +8,6 @@
 d06300b789ea62fcdc61a847b636be9d348682ef piper-cpp
 d101c4099725232110efa115284c5958e4f43353 sv-dependency-builds
 72b4870f0e6b0d3bc279b77cfb550a0c3f846f52 svapp
-09751743647e132cec557ef85654fe8436acae54 svcore
-14dcdc596baf59adec3f8507c302e0424ed76de1 svgui
+e7e626a87a1ef03ba474c25a3c5ae886738c134e svcore
+cdaeff1858af72b24f40b5799d8d11c495dc14f0 svgui
 946d850c940c1aa46e0db3dae1625182d2f7ca9e vamp-plugin-sdk