diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-14 16:42:40 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-14 16:42:40 -0400 |
| commit | 7a30e63eaad66ded1c47f5cdb2e0f28c3b0a1d4a (patch) | |
| tree | 25e1b01865e76193f3c88483d4f9de1c8abf2f9d /gtk2_ardour/actions.h | |
| parent | e6521bb0434d88802aa28e75235bc8c19ebb9262 (diff) | |
| parent | f5191e62578bd2ba2b3e2adf8cfc3634aa4b929c (diff) | |
fix merge conflicts with master
Diffstat (limited to 'gtk2_ardour/actions.h')
| -rw-r--r-- | gtk2_ardour/actions.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/actions.h b/gtk2_ardour/actions.h index 20c0532636..f3fba51de5 100644 --- a/gtk2_ardour/actions.h +++ b/gtk2_ardour/actions.h @@ -46,8 +46,8 @@ namespace ActionManager { extern std::vector<Glib::RefPtr<Gtk::Action> > range_sensitive_actions; extern std::vector<Glib::RefPtr<Gtk::Action> > transport_sensitive_actions; - extern std::vector<Glib::RefPtr<Gtk::Action> > jack_sensitive_actions; - extern std::vector<Glib::RefPtr<Gtk::Action> > jack_opposite_sensitive_actions; + extern std::vector<Glib::RefPtr<Gtk::Action> > engine_sensitive_actions; + extern std::vector<Glib::RefPtr<Gtk::Action> > engine_opposite_sensitive_actions; extern std::vector<Glib::RefPtr<Gtk::Action> > edit_point_in_region_sensitive_actions; extern void map_some_state (const char* group, const char* action, bool (ARDOUR::RCConfiguration::*get)() const); |