Merge branch 'master' of github.com:Ultimaker/Cura

This commit is contained in:
Jack Ha 2018-06-06 11:02:10 +02:00
commit 87293e089d
7 changed files with 55 additions and 32 deletions

View file

@ -34,7 +34,6 @@ Item
}
}
/* Hide for 3.4
ToolboxTabButton
{
text: catalog.i18nc("@title:tab", "Materials")
@ -47,7 +46,6 @@ Item
toolbox.viewPage = "overview"
}
}
*/
}
ToolboxTabButton
{

View file

@ -65,7 +65,6 @@ ScrollView
}
}
}
/* Hidden in 3.4
Label
{
visible: toolbox.materialsInstalledModel.items.length > 0
@ -103,6 +102,5 @@ ScrollView
}
}
}
*/
}
}