summaryrefslogtreecommitdiff
path: root/gtk2_ardour/ardour.menus.in
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2010-08-16 19:58:34 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2010-08-16 19:58:34 +0000
commita4d9d09af5853f769e1143c2353806bfb7d89f58 (patch)
tree05dc35268557395124f130ec8b6d8e32c6e49b7b /gtk2_ardour/ardour.menus.in
parent0b2f156c5850fb1c60aae25df4b9767bd7f92b89 (diff)
forward port 2.X changes up to and including rev 6714
git-svn-id: svn://localhost/ardour2/branches/3.0@7635 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour.menus.in')
-rw-r--r--gtk2_ardour/ardour.menus.in6
1 files changed, 4 insertions, 2 deletions
diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 8d6950b90b..9aaada247b 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -29,10 +29,11 @@
<menuitem action='CleanupUnused'/>
<menuitem action='FlushWastebasket'/>
</menu>
+#ifndef GTKOSX
<separator/>
+#endif
<menuitem action='ToggleSessionOptionsEditor'/>
- <separator/>
-#ifdef GTKOSX
+#ifndef GTKOSX
<menuitem action='ToggleRCOptionsEditor'/>
<menuitem action='About'/>
#endif
@@ -265,6 +266,7 @@
<menuitem action='region-fill-track'/>
<separator/>
<menuitem action='loop-region'/>
+ <menuitem action='set-loop-from-region'/>
<menuitem action='set-punch-from-region'/>
<menuitem action='add-range-marker-from-region'/>
<menuitem action='add-range-markers-from-region'/>