Cura/resources/qml/Settings
Jack Ha bfabf8d11a Merge, fix qml files. Contributes to CURA-2007.
Merge branch 'feature_quality_changes' into cura-2007

Conflicts:
	resources/qml/Settings/SettingItem.qml
	resources/qml/Settings/SettingView.qml
2016-08-04 18:22:36 +02:00
..
SettingCategory.qml Ensure the control has active focus when clicking a SettingItem 2016-06-14 17:29:05 +02:00
SettingCheckBox.qml Ensure the control has active focus when clicking a SettingItem 2016-06-14 17:29:05 +02:00
SettingComboBox.qml Fix SettingComboBox and SettingExtruder in some contexts 2016-07-28 13:45:11 +02:00
SettingExtruder.qml Fix SettingComboBox and SettingExtruder in some contexts 2016-07-28 13:45:11 +02:00
SettingItem.qml Merge, fix qml files. Contributes to CURA-2007. 2016-08-04 18:22:36 +02:00
SettingTextField.qml Merge, fix qml files. Contributes to CURA-2007. 2016-08-04 18:22:36 +02:00
SettingUnknown.qml Fix SettingUnknown setting handler to display correctly 2016-05-11 17:19:31 +02:00
SettingView.qml Merge, fix qml files. Contributes to CURA-2007. 2016-08-04 18:22:36 +02:00