diff options
author | John Emmas <johne53@tiscali.co.uk> | 2013-10-06 11:56:03 +0100 |
---|---|---|
committer | John Emmas <johne53@tiscali.co.uk> | 2013-10-06 11:56:03 +0100 |
commit | 300b484cf6ac14c15e365c4062345d64a61c4b18 (patch) | |
tree | f10b9abedc141192f5c35f9c0f40e94f1d52786d /libs/ardour/enums.cc | |
parent | 7d78172abfd9b02bcb6809db3f7545e90dbe968d (diff) | |
parent | 2d5e605bf124c82f77a5a893e540bc176164947d (diff) |
Merge branch 'master' into windows+cc
Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui_options.cc
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 bab0e8ed15..2a38cd2c8a 100644 --- a/libs/ardour/enums.cc +++ b/libs/ardour/enums.cc @@ -336,6 +336,7 @@ setup_enum_writer () REGISTER_ENUM (MTC); REGISTER_ENUM (JACK); + REGISTER_ENUM (Engine); REGISTER_ENUM (MIDIClock); REGISTER_ENUM (LTC); REGISTER (_SyncSource); |