diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-22 19:19:24 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-22 15:31:24 -0500 |
commit | 9b9a7beb130d183fc08a57927a3eaf4441be6809 (patch) | |
tree | 2857fa4cdf41c3949d262634fbff8af9ac6f95f0 /gtk2_ardour/rc_option_editor.cc | |
parent | ec65e351acea329de1d09b8ce518a023001dfdab (diff) |
cleanup various merge conflict resolution errors/omissions
Diffstat (limited to 'gtk2_ardour/rc_option_editor.cc')
-rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 5bb68bd6e5..5cbe3163fa 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -54,6 +54,7 @@ #include "ardour_window.h" #include "ardour_dialog.h" +#include "ardour_ui.h" #include "gui_thread.h" #include "meter_patterns.h" #include "midi_tracer.h" |