# HG changeset patch
# User gyorgyf
# Date 1371590290 -3600
# Node ID f215fba963aa4075bc7f467dee765e1ea221d250
# Parent  f073611b31d1d5011aeb418eef96122231c1aaa2
bugfixes to compile on Linux again

diff -r f073611b31d1 -r f215fba963aa layer/FlexiNoteLayer.cpp
--- 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;