# HG changeset patch
# User Chris Cannam
# Date 1431614387 -3600
# Node ID 728343b946224fe73882b68b165c122f9f28f754
# Parent  c9d87032f3da42dce35deb79ceb1101a20a1321d# Parent  5f2c90f7d22577af2c8daa6f441011bb5d7cfdb6
Merge from default branch

diff -r c9d87032f3da -r 728343b94622 .hgsubstate
--- a/.hgsubstate	Wed Apr 29 13:28:44 2015 +0100
+++ b/.hgsubstate	Thu May 14 15:39:47 2015 +0100
@@ -1,5 +1,5 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
 dc1a360f2b694d73d4bc858b708db44249e2cddc svapp
-32ab6c48efaa23d24a67315bccdc27f3ba1a18d5 svcore
-092de22db207791d93628688a35031261735bbd5 svgui
+f4ad0bfceeb7cc40ab00ecc97883ac02d123a6fd svcore
+fa96108d552d4edc2319b9c0fa748afceb970569 svgui
diff -r c9d87032f3da -r 728343b94622 main/MainWindow.cpp
--- a/main/MainWindow.cpp	Wed Apr 29 13:28:44 2015 +0100
+++ b/main/MainWindow.cpp	Thu May 14 15:39:47 2015 +0100
@@ -4594,7 +4594,7 @@
 #endif
 
     aboutText += 
-        "<p><small>Sonic Visualiser Copyright &copy; 2005&ndash;2013 Chris Cannam and "
+        "<p><small>Sonic Visualiser Copyright &copy; 2005&ndash;2015 Chris Cannam and "
         "Queen Mary, University of London.</small></p>"
         "<p><small>This program is free software; you can redistribute it and/or "
         "modify it under the terms of the GNU General Public License as "