From bc487bb4b02a9780938d6cf8528c888e59161aa9 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 26 Oct 2015 14:35:06 -0400 Subject: replicate the remove-all-trailing whitespace commit(s) in master --- gtk2_ardour/mixer_ui.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gtk2_ardour/mixer_ui.h') diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h index 1d7a0f1114..509143cfe5 100644 --- a/gtk2_ardour/mixer_ui.h +++ b/gtk2_ardour/mixer_ui.h @@ -361,7 +361,10 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p ======= void create_own_window (); +<<<<<<< HEAD >>>>>>> the basics of tabbed +======= +>>>>>>> replicate the remove-all-trailing whitespace commit(s) in master /// true if we are in fullscreen mode bool _maximised; -- cgit v1.2.3