3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-26 12:21:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 15
Cura/resources/qml/Settings
History
Ghostkeeper 03b4213e92
Merge branch '3.2' 
Conflicts in Cura.qml and SaveButton.qml from people fixing positioning rounding at the same time...
2018-02-12 13:10:24 +01:00
..
SettingCategory.qml Merge branch '3.2' 2018-02-12 13:10:24 +01:00
SettingCheckBox.qml resolve conflict 2018-02-09 13:01:56 +01:00
SettingComboBox.qml resolve conflict 2018-02-09 13:01:56 +01:00
SettingExtruder.qml Merge branch '3.2' 2018-02-12 13:10:24 +01:00
SettingItem.qml Merge branch '3.2' 2018-02-12 13:10:24 +01:00
SettingOptionalExtruder.qml resolve conflict 2018-02-09 13:01:56 +01:00
SettingTextField.qml Merge branch '3.2' 2018-01-16 09:28:40 +01:00
SettingUnknown.qml Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2018-01-08 10:56:12 +01:00
SettingView.qml Merge branch '3.2' 2018-02-12 13:10:24 +01:00