cleanup various merge conflict resolution errors/omissions
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 22 Oct 2015 23:19:24 +0000 (19:19 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Mon, 22 Feb 2016 20:31:24 +0000 (15:31 -0500)
commit9b9a7beb130d183fc08a57927a3eaf4441be6809
tree2857fa4cdf41c3949d262634fbff8af9ac6f95f0
parentec65e351acea329de1d09b8ce518a023001dfdab
cleanup various merge conflict resolution errors/omissions
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui_dependents.cc
gtk2_ardour/ardour_ui_ed.cc
gtk2_ardour/editor.cc
gtk2_ardour/editor_canvas.cc
gtk2_ardour/plugin_ui.cc
gtk2_ardour/rc_option_editor.cc
gtk2_ardour/utils.cc