# HG changeset patch
# User Chris Cannam
# Date 1445260695 -3600
# Node ID 0ab091a4538f3adecdb91e760f9ecb38386dccb9
# Parent  a3d73feeb850dc66750f50bbfa7b9c4dfc10b45f# Parent  0409d903e756c386c6c0dd304d776bc5ad794902
Merge from branch "2.0-integration"

diff -r 0409d903e756 -r 0ab091a4538f src/MainWindow.cpp
--- a/src/MainWindow.cpp	Mon Oct 19 14:17:55 2015 +0100
+++ b/src/MainWindow.cpp	Mon Oct 19 14:18:15 2015 +0100
@@ -1430,10 +1430,6 @@
     emit canExportNotes(haveNotes);
     emit canSnapNotes(haveSelection && haveNotes);
 
-    cerr << "haveWaveform = " << haveWaveform << endl;
-    cerr << "haveMainModel = " << haveMainModel << endl;
-    cerr << "havePlayTarget = " << havePlayTarget << endl;
-    
     emit canPlayWaveform(haveWaveform && haveMainModel && havePlayTarget);
     emit canPlayPitch(havePitchTrack && haveMainModel && havePlayTarget);
     emit canPlayNotes(haveNotes && haveMainModel && havePlayTarget);
@@ -3222,7 +3218,7 @@
         .arg(QT_VERSION_STR);
 
     aboutText += 
-        "<p>Copyright &copy; 2005&ndash;2014 Chris Cannam, Queen Mary University of London, and the Tony project authors: Matthias Mauch, George Fazekas, Justin Salamon, and Rachel Bittner.</p>"
+        "<p>Copyright &copy; 2005&ndash;2015 Chris Cannam, Queen Mary University of London, and the Tony project authors: Matthias Mauch, George Fazekas, Justin Salamon, and Rachel Bittner.</p>"
         "<p>pYIN analysis plugin written by Matthias Mauch.</p>"
         "<p>This program is free software; you can redistribute it and/or "
         "modify it under the terms of the GNU General Public License as "