# HG changeset patch
# User Chris Cannam
# Date 1442492971 -3600
# Node ID 9918aaf0b790a10dd536d79c52f87d889873b428
# Parent  40ff7c801fc2db62d899b6c7ea9871b12cc8eaae# Parent  f0b4285cad7ada4c326d922ead632624c88598b9
Merge from branch "scalable-icons"

diff -r 40ff7c801fc2 -r 9918aaf0b790 .hgsubstate
--- a/.hgsubstate	Thu Aug 20 16:41:51 2015 +0100
+++ b/.hgsubstate	Thu Sep 17 13:29:31 2015 +0100
@@ -2,7 +2,7 @@
 62c40e7f9231e459091c3352c5d4b6001be127ca bqresample
 94b6ebd5e8ab897e5b294fd77b4113e8d6d78b13 bqvec
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
-3777c7bf171aa4e8600fabbacf0cfb7c9b18aedc icons/scalable
+c6ca18292bfe9ba9bd67b0aa59320893f2954333 icons/scalable
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
 52c0aff69478e2fcb6a3ae9e7aaa56ee3f07c87a svapp
 2c43f99040689b482b52971b1edef6b697427f21 svcore
diff -r 40ff7c801fc2 -r 9918aaf0b790 sonic-visualiser.qrc
--- a/sonic-visualiser.qrc	Thu Aug 20 16:41:51 2015 +0100
+++ b/sonic-visualiser.qrc	Thu Sep 17 13:29:31 2015 +0100
@@ -19,6 +19,7 @@
     <file>icons/scalable/ffwd-end.svg</file>
     <file>icons/scalable/ffwd.svg</file>
     <file>icons/scalable/navigate.svg</file>
+    <file>icons/scalable/move.svg</file>
     <file>icons/scalable/pause.svg</file>
     <file>icons/scalable/playloop.svg</file>
     <file>icons/scalable/playpause.svg</file>