Mercurial > hg > svgui

diff layer/FlexiNoteLayer.cpp @ 654:f215fba963aa tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bugfixes to compile on Linux again
author gyorgyf
date Tue, 18 Jun 2013 22:18:10 +0100
parents f073611b31d1
children c572a0705223
line wrap: on
line diff
--- a/layer/FlexiNoteLayer.cpp	Tue Jun 18 22:14:28 2013 +0100
+++ b/layer/FlexiNoteLayer.cpp	Tue Jun 18 22:18:10 2013 +0100
@@ -37,6 +37,7 @@
 #include <iostream>
 #include <cmath>
 #include <utility>
+#include <limits>
 
 FlexiNoteLayer::FlexiNoteLayer() :
     SingleColourLayer(),
@@ -1038,11 +1039,6 @@
             break;
         }
     }
-<<<<<<< local
-    if (m_editMode == dragNote) m_editingPoint.value = value;
-=======
-    
->>>>>>> other
     m_editingCommand->addPoint(m_editingPoint);
     std::cerr << "added new point(" << m_editingPoint.frame << "," << m_editingPoint.duration << ")" << std::endl;