Merge remote-tracking branch 'origin/master' into refactoring_machine_manager

This commit is contained in:
Lipu Fei 2018-02-28 15:29:22 +01:00
commit 3e23659c79
4 changed files with 3 additions and 10 deletions

View file

@ -69,7 +69,6 @@ Item
property alias configureSettingVisibility: configureSettingVisibilityAction
property alias browsePlugins: browsePluginsAction
property alias configurePlugins: configurePluginsAction
UM.I18nCatalog{id: catalog; name:"cura"}
@ -425,13 +424,6 @@ Item
iconName: "plugins_browse"
}
Action
{
id: configurePluginsAction
text: catalog.i18nc("@action:menu", "Installed plugins...");
iconName: "plugins_configure"
}
Action
{
id: expandSidebarAction;