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

This commit is contained in:
Ghostkeeper 2017-09-27 14:20:38 +02:00
commit d417bfc7cc
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
23 changed files with 111 additions and 112 deletions

View file

@ -320,8 +320,8 @@ Cura.MachineAction
title: catalog.i18nc("@title:window", "Printer Address")
minimumWidth: 400 * Screen.devicePixelRatio
minimumHeight: 120 * Screen.devicePixelRatio
minimumWidth: 400 * screenScaleFactor
minimumHeight: 120 * screenScaleFactor
width: minimumWidth
height: minimumHeight