diff options
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/ardour.menus | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus index 54060c06aa..0c374bbd67 100644 --- a/gtk2_ardour/ardour.menus +++ b/gtk2_ardour/ardour.menus @@ -92,27 +92,6 @@ <menuitem action='edit-cursor-to-range-start'/> <menuitem action='edit-cursor-to-range-end'/> </menu> -<<<<<<< .working - <menu action='RegionEditOps'> - <menuitem action='crop'/> - <menuitem action='duplicate-region'/> - <menuitem action='insert-region'/> - <menuitem action='normalize-region'/> - <separator/> - <menuitem action="nudge-forward"/> - <menuitem action="nudge-next-forward"/> - <menuitem action="nudge-backward"/> - <menuitem action="nudge-next-backward"/> - <separator/> - <menuitem action='align-regions-start'/> - <menuitem action='align-regions-start-relative'/> - <menuitem action='align-regions-end'/> - <menuitem action='align-regions-end-relative'/> - <menuitem action='align-regions-sync'/> - <menuitem action='align-regions-sync-relative'/> - </menu> -======= ->>>>>>> .merge-right.r2626 <menu name='KeyMouse Actions' action='KeyMouse Actions'> <menuitem action='audition-at-mouse'/> <menuitem action='brush-at-mouse'/> |