summaryrefslogtreecommitdiff
path: root/gtk2_ardour/utils.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2015-10-22 19:19:24 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2016-02-22 15:31:24 -0500
commit9b9a7beb130d183fc08a57927a3eaf4441be6809 (patch)
tree2857fa4cdf41c3949d262634fbff8af9ac6f95f0 /gtk2_ardour/utils.cc
parentec65e351acea329de1d09b8ce518a023001dfdab (diff)
cleanup various merge conflict resolution errors/omissions
Diffstat (limited to 'gtk2_ardour/utils.cc')
-rw-r--r--gtk2_ardour/utils.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index 589ec54794..eddae2974e 100644
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -54,6 +54,7 @@
#include "gui_thread.h"
#include "ui_config.h"
#include "ardour_dialog.h"
+#include "ardour_ui.h"
using namespace std;
using namespace Gtk;