diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-12 11:28:50 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-12 11:28:50 -0400 |
| commit | bb826f4beebfcedc50570b818c305560d2233e47 (patch) | |
| tree | 1484460f914e64fdbdce58230ffe7934bc0761f4 /gtk2_ardour/actions.cc | |
| parent | 8c5cff60912c7e0a7256f635641399500d8d00d9 (diff) | |
| parent | f85b362351a5f9167f93b6988f2c8a4c7e03a33c (diff) | |
incomplete merge of master into windows (requires upcoming changes to master to be complete)
Diffstat (limited to 'gtk2_ardour/actions.cc')
| -rw-r--r-- | gtk2_ardour/actions.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc index 3b0133b535..cefaeeb4cf 100644 --- a/gtk2_ardour/actions.cc +++ b/gtk2_ardour/actions.cc @@ -58,8 +58,8 @@ vector<RefPtr<Gtk::Action> > ActionManager::playlist_selection_sensitive_actions vector<RefPtr<Gtk::Action> > ActionManager::mouse_edit_point_requires_canvas_actions; vector<RefPtr<Gtk::Action> > ActionManager::range_sensitive_actions; -vector<RefPtr<Gtk::Action> > ActionManager::jack_sensitive_actions; -vector<RefPtr<Gtk::Action> > ActionManager::jack_opposite_sensitive_actions; +vector<RefPtr<Gtk::Action> > ActionManager::engine_sensitive_actions; +vector<RefPtr<Gtk::Action> > ActionManager::engine_opposite_sensitive_actions; vector<RefPtr<Gtk::Action> > ActionManager::transport_sensitive_actions; vector<RefPtr<Gtk::Action> > ActionManager::edit_point_in_region_sensitive_actions; |