diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-01-11 21:36:44 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-22 15:31:25 -0500 |
| commit | c932c562330f4611c14dd6846d6cd617507695db (patch) | |
| tree | 37bba7f71c534dc343341869f7b6ad1399d670d1 /gtk2_ardour/ardour_ui.cc | |
| parent | e268a9d2aae5012d494680d851abe1415c2063c6 (diff) | |
cleanup post-rebase-against-master messes
Diffstat (limited to 'gtk2_ardour/ardour_ui.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 344ca17d18..9e48335ff7 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -226,12 +226,7 @@ libxml_structured_error_func (void* /* parsing_context*/, ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir) -<<<<<<< HEAD - : Gtkmm2ext::UI (PROGRAM_NAME, X_("gui"), argcp, argvp) -======= - : Gtkmm2ext::UI (PROGRAM_NAME, argcp, argvp) ->>>>>>> first compilable version of tabbable design. , session_loaded (false) , gui_object_state (new GUIObjectState) , primary_clock (new MainClock (X_("primary"), X_("transport"), true )) @@ -2928,8 +2923,6 @@ ARDOUR_UI::load_from_application_api (const std::string& path) if (get_session_parameters (true, false)) { exit (1); } - - goto_editor_window (); } } |