diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-26 14:35:06 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-22 15:31:24 -0500 |
| commit | bc487bb4b02a9780938d6cf8528c888e59161aa9 (patch) | |
| tree | 967703b895cafc301d3a0d4876c343370760fef2 /gtk2_ardour/mixer_ui.h | |
| parent | 589f2a1ab83e4498920faa2f0ef37c1632eaf914 (diff) | |
replicate the remove-all-trailing whitespace commit(s) in master
Diffstat (limited to 'gtk2_ardour/mixer_ui.h')
| -rw-r--r-- | gtk2_ardour/mixer_ui.h | 3 |
1 files changed, 3 insertions, 0 deletions
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; |