Cura/resources/qml/Preferences
fieldOfView a17160f52d Merge branch 'master' into feature_setting_visibility_profiles
# Conflicts:
#	resources/qml/Settings/SettingView.qml
2018-02-15 11:54:45 +01:00
..
GeneralPage.qml Merge branch '3.2' 2018-02-14 10:53:51 +01:00
MachinesPage.qml Fixed broken printjob state in machines page 2018-01-12 11:04:10 +01:00
MaterialsPage.qml Merge branch '3.2' 2018-02-14 10:53:51 +01:00
MaterialView.qml Merge branch '3.2' 2018-02-14 10:53:51 +01:00
ProfilesPage.qml CURA-4845 Revert changes when accessing the quality changes at the time 2018-01-22 13:08:30 +01:00
ProfileTab.qml Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
ReadOnlySpinBox.qml Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
ReadOnlyTextArea.qml Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
ReadOnlyTextField.qml Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
SettingVisibilityPage.qml Add back "custom" option to the setting visibility page 2018-02-09 19:28:00 +01:00