Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10

This commit is contained in:
Tamara Hogenhout 2015-10-26 16:35:51 +01:00
commit 91a8746c03
2 changed files with 0 additions and 5 deletions

View File

@ -47,7 +47,6 @@ Item
Action Action
{ {
id:toggleFullScreenAction id:toggleFullScreenAction
shortcut: StandardKey.FullScreen;
text: catalog.i18nc("@action:inmenu","Toggle Fu&ll Screen"); text: catalog.i18nc("@action:inmenu","Toggle Fu&ll Screen");
iconName: "view-fullscreen"; iconName: "view-fullscreen";
} }

View File

@ -152,10 +152,6 @@ UM.MainWindow
onObjectRemoved: top_view_menu.removeItem(object) onObjectRemoved: top_view_menu.removeItem(object)
} }
ExclusiveGroup { id: view_menu_top_group; } ExclusiveGroup { id: view_menu_top_group; }
MenuSeparator { }
MenuItem { action: actions.toggleFullScreen; }
} }
Menu Menu
{ {