Mercurial > hg > sonic-visualiser

changeset 1062:9918aaf0b790 3.0-integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "scalable-icons"
author Chris Cannam
date Thu, 17 Sep 2015 13:29:31 +0100
parents 40ff7c801fc2 (current diff) f0b4285cad7a (diff)
children 1f92fc7a6b05
files .hgsubstate sonic-visualiser.qrc
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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>