manually fix rebase/merge issues caused by addition of plugin presets to methods...
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 17 May 2016 12:21:05 +0000 (08:21 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 31 May 2016 19:30:42 +0000 (15:30 -0400)
commit2c9c2102138f20e32545f8bda7d1dc72587663e8
tree5fc48fa8131d7b10dda47cd3c1eb97d5cf72b36a
parent4b0a235f91c43a0011b2bc466a910c5b015560e0
manually fix rebase/merge issues caused by addition of plugin presets to methods which add a new track/bus
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui_ed.cc
gtk2_ardour/editor_audio_import.cc
gtk2_ardour/editor_canvas_events.cc
gtk2_ardour/editor_drag.cc
gtk2_ardour/mixer_ui.cc
libs/ardour/ardour/session.h
libs/ardour/session.cc