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

This commit is contained in:
Aleksei S 2018-05-14 11:21:01 +02:00
commit c60dad6a4a

View File

@ -16,9 +16,10 @@ Window
width: 720 * screenScaleFactor width: 720 * screenScaleFactor
height: 640 * screenScaleFactor height: 640 * screenScaleFactor
minimumWidth: 720 * screenScaleFactor minimumWidth: width
maximumWidth: 720 * screenScaleFactor maximumWidth: minimumWidth
minimumHeight: 350 * screenScaleFactor minimumHeight: height
maximumHeight: minimumHeight
color: UM.Theme.getColor("sidebar") color: UM.Theme.getColor("sidebar")
UM.I18nCatalog UM.I18nCatalog
{ {