changeset 1964:690eaf241ad5 sv_v3.1.1

Merge
author Chris Cannam
date Tue, 14 Aug 2018 09:43:23 +0100
parents 6757ed564f86 (current diff) a29950abf4cc (diff)
children 4d7542238772
files
diffstat 3 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Aug 13 19:18:08 2018 +0100
+++ b/.hgtags	Tue Aug 14 09:43:23 2018 +0100
@@ -77,3 +77,4 @@
 2ea9537868d50ba1a4d4cd54ac3bdeb10b9f4de0 sv_v3.1pre4
 b465eb7018bcc0add14886ac57d4f79f38401b8f sv_v3.1pre4
 f4d7c9522fcff88292ed2b91bc89b30eeaa6794c sv_v3.1
+4ff2193314d406c3a83c86b409414cf60a0b1406 sv_v3.1.1
--- a/README.md	Mon Aug 13 19:18:08 2018 +0100
+++ b/README.md	Tue Aug 14 09:43:23 2018 +0100
@@ -50,14 +50,14 @@
 Christian Landone, Mathieu Barthet, Dan Stowell, Jesus Corral Garcia,
 Matthias Mauch, and Craig Sapp.
 
-Code copyright 2005-2007 Chris Cannam and copyright 2006-2017 Queen
+Code copyright 2005-2007 Chris Cannam and copyright 2006-2018 Queen
 Mary, University of London, except where indicated in the individual
 source files.
 
 Russian translation provided by Alexandre Prokoudine, copyright
-2006-2017 Alexandre Prokoudine.
+2006-2018 Alexandre Prokoudine.
 
-Czech translation provided by Pavel Fric, copyright 2010-2017 Pavel
+Czech translation provided by Pavel Fric, copyright 2010-2018 Pavel
 Fric.
 
 This work was partially funded by the European Commission through the
--- a/main/MainWindow.cpp	Mon Aug 13 19:18:08 2018 +0100
+++ b/main/MainWindow.cpp	Tue Aug 14 09:43:23 2018 +0100
@@ -5127,7 +5127,7 @@
     aboutText += "</small></p>";
 
     aboutText += 
-        "<p><small>Sonic Visualiser Copyright &copy; 2005&ndash;2017 Chris Cannam and "
+        "<p><small>Sonic Visualiser Copyright &copy; 2005&ndash;2018 Chris Cannam and "
         "Queen Mary, University of London.</small></p>";
 
     aboutText +=