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

This commit is contained in:
Jaime van Kessel 2016-06-08 11:02:45 +02:00
commit 761d3f1a27
5 changed files with 45 additions and 28 deletions

View file

@ -143,7 +143,7 @@ Item{
UM.SimpleButton {
id: customisedSettings
visible: UM.ActiveProfile.hasCustomisedValues
visible: Cura.MachineManager.hasUserSettings
height: parent.height * 0.6
width: parent.height * 0.6