fixed bad merge
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 13 Nov 2007 01:55:56 +0000 (01:55 +0000)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 13 Nov 2007 01:55:56 +0000 (01:55 +0000)
commit7b8bfddca68dfec6573f83163ef3f83d9b6455f7
tree6b927ee9dba9859603e96945348feca0090aa38d
parentd346adb1d96f4b016a158a8f0103ea9fb8c565c4
fixed bad merge

git-svn-id: svn://localhost/ardour2/trunk@2632 d708f5d6-7413-0410-9779-e7cbd77b26cf
gtk2_ardour/ardour.menus