merge resolution with master

This commit is contained in:
Paul Davis 2013-05-02 20:21:54 -04:00
commit e2f0c5f91e
66 changed files with 255 additions and 4024 deletions

View file

@ -28,11 +28,11 @@ class NoteBase;
class EditNoteDialog : public ArdourDialog
{
public:
EditNoteDialog (MidiRegionView *, std::set<NoteBase*>);
EditNoteDialog (MidiRegionView* rv, set<NoteBase*> n);
int run ();
private:
void done (int);
private:
MidiRegionView* _region_view;
std::set<NoteBase*> _events;
Gtk::SpinButton _channel;