merge resolution with master

2013-05-02 20:21:54 -04:00
parent c358e77e1e 3973ce81b3
commit e2f0c5f91e
66 changed files with 255 additions and 4024 deletions
--- a/gtk2_ardour/step_editor.cc
+++ b/gtk2_ardour/step_editor.cc
@@ -82,7 +82,6 @@ StepEditor::start_step_editing ()
        step_edit_region_view->show_step_edit_cursor (step_edit_beat_pos);
        step_edit_region_view->set_step_edit_cursor_width (step_editor->note_length());

-        step_editor->set_position (WIN_POS_MOUSE);
        step_editor->present ();
 }