From aaea166135ace01709f7e0be64f40be80f4107ec Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 4 Apr 2013 00:32:52 -0400 Subject: initial commit of hand merging, plus getting "ancient" waf script to work correctly --- gtk2_ardour/edit_note_dialog.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gtk2_ardour/edit_note_dialog.cc') diff --git a/gtk2_ardour/edit_note_dialog.cc b/gtk2_ardour/edit_note_dialog.cc index 17827693e7..2056b5b18e 100644 --- a/gtk2_ardour/edit_note_dialog.cc +++ b/gtk2_ardour/edit_note_dialog.cc @@ -22,9 +22,9 @@ #include "gtkmm2ext/utils.h" -#include "canvas-note-event.h" #include "edit_note_dialog.h" #include "midi_region_view.h" +#include "note_base.h" #include "i18n.h" @@ -38,7 +38,7 @@ using namespace Gtkmm2ext; * @param n Notes to edit. */ -EditNoteDialog::EditNoteDialog (MidiRegionView* rv, set n) +EditNoteDialog::EditNoteDialog (MidiRegionView* rv, set n) : ArdourDialog (_("Note")) , _region_view (rv) , _events (n) -- cgit v1.2.3