Cura/resources/qml/Preferences
Daniel Schiavini a1c252d3a2 Revert "Revert "fix merge conflict""
This reverts commit 4bffa6d90f.
2018-12-07 10:25:46 +01:00
..
Materials Revert "Revert "fix merge conflict"" 2018-12-07 10:25:46 +01:00
GeneralPage.qml Merge branch 'master' of github.com:Ultimaker/Cura into ui_rework_4_0 2018-11-30 15:34:47 +01:00
MachinesPage.qml Revert "Revert "fix merge conflict"" 2018-12-07 10:25:46 +01:00
ProfilesPage.qml Revert "Revert "fix merge conflict"" 2018-12-07 10:25:46 +01:00
ProfileTab.qml Store extruder position of quality groups as int 2018-03-12 17:08:13 +01:00
ReadOnlySpinBox.qml Fix Enter key handling on material management page 2018-03-16 11:05:38 +01:00
ReadOnlyTextArea.qml Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
ReadOnlyTextField.qml Fix Enter key handling on material management page 2018-03-16 11:05:38 +01:00
SettingVisibilityPage.qml Revert "Revert "fix merge conflict"" 2018-12-07 10:25:46 +01:00