projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c932c56
)
fix merge mixup after rebase from master
author
Paul Davis
<paul@linuxaudiosystems.com>
Tue, 2 Feb 2016 15:15:24 +0000
(10:15 -0500)
committer
Paul Davis
<paul@linuxaudiosystems.com>
Mon, 22 Feb 2016 20:31:25 +0000
(15:31 -0500)
gtk2_ardour/ardour_ui_ed.cc
patch
|
blob
|
history
diff --git
a/gtk2_ardour/ardour_ui_ed.cc
b/gtk2_ardour/ardour_ui_ed.cc
index 28fbdf88fb65a7a51279707c5713f0035606e20a..16e1edd68e2825d22ac53ea5eb33afa3e609a43a 100644
(file)
--- a/
gtk2_ardour/ardour_ui_ed.cc
+++ b/
gtk2_ardour/ardour_ui_ed.cc
@@
-166,11
+166,11
@@
ARDOUR_UI::install_actions ()
ActionManager::session_sensitive_actions.push_back (act);
ActionManager::write_sensitive_actions.push_back (act);
ActionManager::session_sensitive_actions.push_back (act);
ActionManager::write_sensitive_actions.push_back (act);
- act = global_actions
::
register_action (main_actions, X_("QuickSnapshotStay"), _("Quick Snapshot(& keep working on current version) ..."), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::quick_snapshot_session), false));
+ act = global_actions
.
register_action (main_actions, X_("QuickSnapshotStay"), _("Quick Snapshot(& keep working on current version) ..."), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::quick_snapshot_session), false));
ActionManager::session_sensitive_actions.push_back (act);
ActionManager::write_sensitive_actions.push_back (act);
ActionManager::session_sensitive_actions.push_back (act);
ActionManager::write_sensitive_actions.push_back (act);
- act = global_actions
::
register_action (main_actions, X_("QuickSnapshotSwitch"), _("Quick Snapshot (& switch to new version) ..."), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::quick_snapshot_session), true));
+ act = global_actions
.
register_action (main_actions, X_("QuickSnapshotSwitch"), _("Quick Snapshot (& switch to new version) ..."), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::quick_snapshot_session), true));
ActionManager::session_sensitive_actions.push_back (act);
ActionManager::write_sensitive_actions.push_back (act);
ActionManager::session_sensitive_actions.push_back (act);
ActionManager::write_sensitive_actions.push_back (act);