mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-11-24 11:21:14 -07:00
Merge branch 'feature_quality_changes' into cura-2007 Conflicts: resources/qml/Settings/SettingItem.qml resources/qml/Settings/SettingView.qml |
||
|---|---|---|
| .. | ||
| SettingCategory.qml | ||
| SettingCheckBox.qml | ||
| SettingComboBox.qml | ||
| SettingExtruder.qml | ||
| SettingItem.qml | ||
| SettingTextField.qml | ||
| SettingUnknown.qml | ||
| SettingView.qml | ||