Jack Ha bfa33c721c CURA-4525 solved merge conflicts

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

..

ContextMenu.qml

Checked build plates in context menu now actually match the selected item's build plates; changed collapse arrow. CURA-4525

2017-12-21 15:08:46 +01:00

MaterialMenu.qml

Fix material_diameter bindings for metarial menu and page

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

NozzleMenu.qml

Resolve merge conflicts with master - CURA-4482

2017-10-31 09:22:03 +01:00

PrinterMenu.qml

Changing AGPLv3 to LGPLv3

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

ProfileMenu.qml

Remove layer height from custom profiles in dropdown as it might have changed - CURA-4482

2017-10-31 14:01:15 +01:00

RecentFilesMenu.qml

Changing AGPLv3 to LGPLv3

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

ViewMenu.qml

Solved merge conflicts. CURA-4525

2017-12-21 10:52:51 +01:00