# HG changeset patch
# User Chris Cannam
# Date 1435753268 -3600
# Node ID ab244c0074baa8e73ebd45f6bdb22d558f05036e
# Parent  2363196deed789326c23c49ffe08a72cabe827df# Parent  a1927baa3d87e0a0d2e5c706f5f481a5305bb9b5
Merge from branch osx-retina

diff -r 2363196deed7 -r ab244c0074ba .hgsubstate
--- a/.hgsubstate	Fri Jun 26 14:18:45 2015 +0100
+++ b/.hgsubstate	Wed Jul 01 13:21:08 2015 +0100
@@ -1,6 +1,6 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
-845471c833a182376747b44a3ca28181bbdb3c93 icons/scalable
+03ad9c0eb6ed8336deb93ae37bae27a7f31d4e7e icons/scalable
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
 83370e830c956be0fc4a7d9b5c30761b6ffb7613 svapp
 ee0aff1d0743680befe36e5627d31c019778d0b0 svcore
-98827470ada2609207b65027dda747869076524b svgui
+3f7cdfc56dce366176fa6d06202c82e156996f2a svgui
diff -r 2363196deed7 -r ab244c0074ba sonic-visualiser.qrc
--- a/sonic-visualiser.qrc	Fri Jun 26 14:18:45 2015 +0100
+++ b/sonic-visualiser.qrc	Wed Jul 01 13:21:08 2015 +0100
@@ -3,8 +3,14 @@
     <file>icons/scalable/align.svg</file>
     <file>icons/scalable/colour3d.svg</file>
     <file>icons/scalable/cross.svg</file>
+    <file>icons/scalable/dataedit.svg</file>
     <file>icons/scalable/draw.svg</file>
     <file>icons/scalable/erase.svg</file>
+    <file>icons/scalable/editcopy.svg</file>
+    <file>icons/scalable/editcut.svg</file>
+    <file>icons/scalable/editdelete.svg</file>
+    <file>icons/scalable/editpaste.svg</file>
+    <file>icons/scalable/exit.svg</file>
     <file>icons/scalable/filenew.svg</file>
     <file>icons/scalable/fileopen.svg</file>
     <file>icons/scalable/filesaveas.svg</file>