comparison layer/FlexiNoteLayer.cpp @ 654:f215fba963aa tonioni

bugfixes to compile on Linux again

 #include <QMessageBox>
 
 #include <iostream>
 #include <cmath>
 #include <utility>
+#include <limits>
 
 FlexiNoteLayer::FlexiNoteLayer() :
     SingleColourLayer(),
 
         // m_model(0),

             }
             m_editingPoint.value = value;
             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;
     
 }