Daniel Schiavini a1c252d3a2 Revert "Revert "fix merge conflict"" ...

This reverts commit 4bffa6d90f2e6e9784c7e5508b61e00a92ecb74f.

2018-12-07 10:25:46 +01:00

..

SettingCategory.qml

Revert "Revert "fix merge conflict""

2018-12-07 10:25:46 +01:00

SettingCheckBox.qml

Revert "Revert "fix merge conflict""

2018-12-07 10:25:46 +01:00

SettingComboBox.qml

Set textFormat for the setting items to PlainText

2018-09-20 15:22:35 +02:00

SettingExtruder.qml

Set textFormat for the setting items to PlainText

2018-09-20 15:22:35 +02:00

SettingItem.qml

Remove all the entries in the theme that make reference to the sidebar,

2018-10-26 17:51:28 +02:00

SettingOptionalExtruder.qml

Revert "Revert "fix merge conflict""

2018-12-07 10:25:46 +01:00

SettingTextField.qml

Reduce the maximum precision of floats in SettingTextField inputs

2018-09-29 08:16:11 +02:00

SettingUnknown.qml

Add the correct value to the setting viewer when the type is unknown.

2018-03-20 11:42:42 +01:00

SettingView.qml

Revert "Revert "fix merge conflict""

2018-12-07 10:25:46 +01:00