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/ardour_ui_ed.cc | |
| parent | ec65e351acea329de1d09b8ce518a023001dfdab (diff) | |
cleanup various merge conflict resolution errors/omissions
Diffstat (limited to 'gtk2_ardour/ardour_ui_ed.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui_ed.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index f9978c39fd..57dd0cc935 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -57,6 +57,7 @@ #include "global_port_matrix.h" #include "location_ui.h" #include "main_clock.h" +#include "rc_option_editor.h" #include <gtkmm2ext/application.h> |