# HG changeset patch
# User Chris Cannam
# Date 1402915745 -3600
# Node ID 8be221f1831388b523b88a74fb2e3d30d2d23291
# Parent  102ffad481e6cf8d8cdf6dc42f09bc9593ec4c6d# Parent  d6b79166ae0d6dcf0ed55aba08f50fdfcd229647
Merge

diff -r d6b79166ae0d -r 8be221f18313 view/View.cpp
--- a/view/View.cpp	Mon Jun 16 11:44:14 2014 +0100
+++ b/view/View.cpp	Mon Jun 16 11:49:05 2014 +0100
@@ -1620,7 +1620,7 @@
 View::paintEvent(QPaintEvent *e)
 {
 //    Profiler prof("View::paintEvent", false);
-//    SVDEBUG << "View::paintEvent: centre frame is " << m_centreFrame << endl;
+//    cerr << "View::paintEvent: centre frame is " << m_centreFrame << endl;
 
     if (m_layers.empty()) {
 	QFrame::paintEvent(e);
diff -r d6b79166ae0d -r 8be221f18313 widgets/CommandHistory.cpp
--- a/widgets/CommandHistory.cpp	Mon Jun 16 11:44:14 2014 +0100
+++ b/widgets/CommandHistory.cpp	Mon Jun 16 11:49:05 2014 +0100
@@ -37,7 +37,7 @@
 
 #include <typeinfo>
 
-#define DEBUG_COMMAND_HISTORY 1
+//#define DEBUG_COMMAND_HISTORY 1
 
 CommandHistory *CommandHistory::m_instance = 0;