Daniel Schiavini bfe04a55f9 Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into STAR-322_cloud-connection

2018-12-10 10:45:37 +01:00

..

MachineSelector.qml

Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown

2018-12-06 16:35:07 +01:00

MachineSelectorButton.qml

Fix some leftover renamings

2018-12-04 13:21:26 +01:00

MachineSelectorList.qml

fix merge conflict

2018-12-06 16:39:58 +01:00