# HG changeset patch
# User Chris Cannam
# Date 1444655199 -3600
# Node ID ffb9df50a761488252257827921b7ef7d3ba7188
# Parent  cb24473eadc542009f85b37d81f3dfdf355ff248# Parent  6e484c58ca252cb65a45edce40f3bd8f7a21a29b
Merge from recording branch

diff -r 6e484c58ca25 -r ffb9df50a761 .hgsubstate
--- a/.hgsubstate	Mon Oct 12 13:24:12 2015 +0100
+++ b/.hgsubstate	Mon Oct 12 14:06:39 2015 +0100
@@ -1,11 +1,11 @@
 5f4dce69ab3eb1cbe38339f7320e9aea9568c369 bqaudioio
-62c40e7f9231e459091c3352c5d4b6001be127ca bqresample
-442c2d44d61715d53c5a687422feaf52d1da6a10 bqvec
+576a130debf70b3a57c9189bfa1de64d8f64dc14 bqresample
+b5c7ca480bf7dc5c602e456480d53ecce3d58e42 bqvec
 456842723db65e5553e3506a8fedc8f21d9ea537 chp
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 c6ca18292bfe9ba9bd67b0aa59320893f2954333 icons/scalable
 5c1572dd225a7fa23b520219ce4515961aafa7a5 pyin
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
-7d9cef941d4d2087600d3cc0a0119470925dfb0f svapp
-815f82508f9635a727d55ec2d32d70bea4f39c6e svcore
+2f5ffd36879b02ce2471fcb60302558838499eb4 svapp
+98898331dc2a174a883a883f93aa70c0517c7cd4 svcore
 477fbf3f10cac47bad2d5c4de3f72bb8b2361ae4 svgui
diff -r 6e484c58ca25 -r ffb9df50a761 tony.qrc
--- a/tony.qrc	Mon Oct 12 13:24:12 2015 +0100
+++ b/tony.qrc	Mon Oct 12 14:06:39 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>