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

This commit is contained in:
Jaime van Kessel 2016-06-08 17:47:46 +02:00
commit 85d5247deb
30 changed files with 201 additions and 34 deletions

View file

@ -220,6 +220,8 @@ Item {
{
id: controlContainer;
enabled: provider.isValueUsed
anchors.right: parent.right;
anchors.rightMargin: UM.Theme.getSize("default_margin").width
anchors.verticalCenter: parent.verticalCenter;