-
Felix Paul Kühne authored
(cherry picked from commit 6e56b492) Conflicts: extras/package/macosx/Resources/English.lproj/MainMenu.xib
b9aa608b
(cherry picked from commit 6e56b492) Conflicts: extras/package/macosx/Resources/English.lproj/MainMenu.xib