3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 21:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
Cura/resources/qml/Settings
History
fieldOfView a17160f52d Merge branch 'master' into feature_setting_visibility_profiles 
# Conflicts:
#	resources/qml/Settings/SettingView.qml
2018-02-15 11:54:45 +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 'master' into feature_setting_visibility_profiles 2018-02-15 11:54:45 +01:00