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.h | |
| parent | ec65e351acea329de1d09b8ce518a023001dfdab (diff) | |
cleanup various merge conflict resolution errors/omissions
Diffstat (limited to 'gtk2_ardour/ardour_ui.h')
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index ace51c79cb..180abfdead 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -145,6 +145,10 @@ namespace Gtk { class ProgressBar; } +namespace Gtkmm2ext { + class Tabbable; +} + class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr { public: |