summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Loftis <ben@harrisonconsoles.com>2015-07-16 17:14:14 -0500
committerBen Loftis <ben@harrisonconsoles.com>2015-07-16 17:14:14 -0500
commit9673e6b2716d2ac1adf3f3ca277bbef60ed4e7cb (patch)
tree7393fa80bb1aacda694715e18b9f8bfb34302e92
parent46c83693284ece4a732d26e62113ea4ac584d539 (diff)
merge fix again
-rw-r--r--gtk2_ardour/editor_ops.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 50b7c81b44..6b1960e30a 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -7421,9 +7421,9 @@ Editor::remove_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt,
if (tempo_too) {
XMLNode& before (_session->tempo_map().get_state());
- if (_session->tempo_map().cut_time (pos, frames) ) {
+ if (_session->tempo_map().remove_time (pos, frames) ) {
if (!in_command) {
- begin_reversible_command (_("cut time"));
+ begin_reversible_command (_("remove time"));
in_command = true;
}
XMLNode& after (_session->tempo_map().get_state());