Cura/resources/qml/Settings
Ghostkeeper ee9de1f11b
Merge branch '3.2'
Lots of conflicts due to rounding vs. flooring of text element positions for weirdness with the font aliasing.
2018-02-14 10:53:51 +01:00
..
SettingCategory.qml Merge branch '3.2' 2018-02-14 10:53:51 +01:00
SettingCheckBox.qml Merge branch '3.2' 2018-02-14 10:53:51 +01:00
SettingComboBox.qml Merge branch '3.2' 2018-02-14 10:53:51 +01:00
SettingExtruder.qml Merge branch '3.2' 2018-02-14 10:53:51 +01:00
SettingItem.qml Merge branch '3.2' 2018-02-14 10:53:51 +01:00
SettingOptionalExtruder.qml Merge branch '3.2' 2018-02-14 10:53:51 +01:00
SettingTextField.qml Merge branch '3.2' 2018-02-14 10:53:51 +01:00
SettingUnknown.qml Revert "Use QTQuick 2.2 to fix garbled fonts" 2018-02-13 14:37:05 +01:00
SettingView.qml Merge branch '3.2' 2018-02-14 10:53:51 +01:00