diff src/mainwindow.cpp @ 647:a03264984ef8

Merge

--- a/src/mainwindow.cpp	Fri Jan 11 10:29:36 2013 +0000
+++ b/src/mainwindow.cpp	Mon Jan 21 10:22:44 2013 +0000
@@ -5,8 +5,8 @@
 
     Based on hgExplorer by Jari Korhonen
     Copyright (c) 2010 Jari Korhonen
-    Copyright (c) 2012 Chris Cannam
-    Copyright (c) 2012 Queen Mary, University of London
+    Copyright (c) 2013 Chris Cannam
+    Copyright (c) 2013 Queen Mary, University of London
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -193,9 +193,9 @@
                          "<p>EasyMercurial is based on HgExplorer by "
                          "Jari Korhonen, with thanks.</p>"
                          "<p style=\"margin-left: 2em;\">"
-                         "Copyright &copy; 2012 Queen Mary, University of London.<br>"
+                         "Copyright &copy; 2013 Queen Mary, University of London.<br>"
                          "Copyright &copy; 2010 Jari Korhonen.<br>"
-                         "Copyright &copy; 2012 Chris Cannam."
+                         "Copyright &copy; 2013 Chris Cannam."
                          "</p>"
                          "<p style=\"margin-left: 2em;\">"
                          "This program requires Mercurial, by Matt Mackall and others.<br>"