diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-13 01:55:56 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-13 01:55:56 +0000 |
| commit | 7b8bfddca68dfec6573f83163ef3f83d9b6455f7 (patch) | |
| tree | 6b927ee9dba9859603e96945348feca0090aa38d /gtk2_ardour | |
| parent | d346adb1d96f4b016a158a8f0103ea9fb8c565c4 (diff) | |
fixed bad merge
git-svn-id: svn://localhost/ardour2/trunk@2632 d708f5d6-7413-0410-9779-e7cbd77b26cf
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'/> |