diff options
author | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2014-07-01 19:10:47 +0100 |
---|---|---|
committer | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2014-07-01 19:10:47 +0100 |
commit | e5e12acc5698090f2c0c614385e457cc0b46fbb0 (patch) | |
tree | 3f4f28baba25f4e276d669d98ff485f7c51aa0b1 /libs/ardour/enums.cc | |
parent | 23e7cf10191270d70357ccf0ed9294f020c7b7ab (diff) | |
parent | da65f3778c66dd2935709445c9a5dbd225296439 (diff) |
Merge branch 'ripple-mode-cc' into cairocanvas
Fix up merge conflicts in
gtk2_ardour/editor_mouse.cc
gtk2_ardour/editor_ops.cc
Also fix up compile errors.
Diffstat (limited to 'libs/ardour/enums.cc')
-rw-r--r-- | libs/ardour/enums.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc index 7a200ee0a0..6f4158d5de 100644 --- a/libs/ardour/enums.cc +++ b/libs/ardour/enums.cc @@ -235,6 +235,7 @@ setup_enum_writer () REGISTER_ENUM (Slide); REGISTER_ENUM (Splice); + REGISTER_ENUM (Ripple); // XXX do the old enum values have to stay in order? REGISTER_ENUM (Lock); REGISTER (_EditMode); |