merge resolution with master
authorPaul Davis <paul@linuxaudiosystems.com>
Fri, 3 May 2013 00:21:54 +0000 (20:21 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Fri, 3 May 2013 00:21:54 +0000 (20:21 -0400)
commite2f0c5f91e2579c41d8efc9495b6ebac31a61ba3
treeb8a15778c018df9c3615d7a1b0d6cc41dfef6626
parentc358e77e1e81a68fcb8b18cd71a31c38262b2af7
parent3973ce81b37a9ba6fcd2e7ff95ca730b0aa32252
merge resolution with master
16 files changed:
gtk2_ardour/audio_region_view.cc
gtk2_ardour/crossfade_edit.cc
gtk2_ardour/edit_note_dialog.cc
gtk2_ardour/edit_note_dialog.h
gtk2_ardour/editor.cc
gtk2_ardour/editor.h
gtk2_ardour/editor_canvas_events.cc
gtk2_ardour/editor_markers.cc
gtk2_ardour/editor_mouse.cc
gtk2_ardour/editor_ops.cc
gtk2_ardour/editor_tempodisplay.cc
gtk2_ardour/midi_region_view.cc
gtk2_ardour/midi_time_axis.cc
gtk2_ardour/note_base.cc
gtk2_ardour/public_editor.h
gtk2_ardour/step_editor.cc