From 6991a07902cc844b87c895aa56de613c96b88b4f Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 26 Oct 2015 15:17:42 -0400 Subject: remove all trace of SAE from source code. This had become incoherent over time, and posed a development hazard and burden going forward --- gtk2_ardour/mixer_ui.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'gtk2_ardour/mixer_ui.h') diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h index 509143cfe5..e5985f830c 100644 --- a/gtk2_ardour/mixer_ui.h +++ b/gtk2_ardour/mixer_ui.h @@ -347,7 +347,6 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p void monitor_section_going_away (); -<<<<<<< HEAD void monitor_section_attached (); void monitor_section_detached (); @@ -358,13 +357,6 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p void sync_treeview_favorite_ui_state (const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator&); void save_favorite_ui_state (const Gtk::TreeModel::iterator& iter, const Gtk::TreeModel::Path& path); -======= - 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