diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-10 15:03:30 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-10 15:03:30 +0000 |
| commit | 68e943265edf04e63a8e8b8f62bab20f99d9c637 (patch) | |
| tree | ff8941a59662fc0c4622944b65f7b2d5e3bdd0c3 /gtk2_ardour/ardour-sae.menus | |
| parent | e4372df05b7d74a6b80dbbf4b6c00cc2b31c4723 (diff) | |
merge from 2.0-ongoing @ 3581
git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour-sae.menus')
| -rw-r--r-- | gtk2_ardour/ardour-sae.menus | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/gtk2_ardour/ardour-sae.menus b/gtk2_ardour/ardour-sae.menus index dc9d7d1b5f..c2721f2a29 100644 --- a/gtk2_ardour/ardour-sae.menus +++ b/gtk2_ardour/ardour-sae.menus @@ -326,6 +326,7 @@ </menubar> +<<<<<<< .working <popup action="RulerMenuPopup"> <menuitem action="toggle-minsec-ruler"/> <menuitem action="toggle-samples-ruler"/> @@ -339,6 +340,21 @@ </popup> <popup name='processormenu'> +======= + <popup action="RulerMenuPopup"> + <menuitem action="toggle-minsec-ruler"/> + <menuitem action="toggle-samples-ruler"/> + <menuitem action="toggle-bbt-ruler"/> + <separator/> + <menuitem action="toggle-meter-ruler"/> + <menuitem action="toggle-tempo-ruler"/> + <menuitem action="toggle-loop-punch-ruler"/> + <menuitem action="toggle-cd-marker-ruler"/> + <menuitem action="toggle-marker-ruler"/> + </popup> + + <popup name='redirectmenu'> +>>>>>>> .merge-right.r3622 <menuitem action='newplugin'/> <menuitem action='newinsert'/> <menuitem action='newsend'/> |