Jack Ha bfa33c721c CURA-4525 solved merge conflicts

2018-01-03 13:52:55 +01:00

..

GeneralPage.qml

CURA-4525 solved merge conflicts

2018-01-03 13:52:55 +01:00

MachinesPage.qml

Fix for showing printer connect button on component load, use newer CuraApplication as target

2017-12-08 16:02:22 +01:00

MaterialsPage.qml

Fix material_diameter bindings for metarial menu and page

2018-01-03 11:27:30 +01:00

MaterialView.qml

Fix 'Could not get metadata of container <empty string>'

2017-10-30 11:15:41 +01:00

ProfilesPage.qml

Merge pull request #2685 from Ultimaker/container_stack_improvements

2017-11-20 17:42:26 +01:00

ProfileTab.qml

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

ReadOnlySpinBox.qml

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

ReadOnlyTextArea.qml

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

ReadOnlyTextField.qml

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

SettingVisibilityPage.qml

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00