Lipu Fei 94e89ad4ac Fix merge conflicts with master

2019-09-24 14:26:43 +02:00

..

SettingCategory.qml

Remove another unneeded catalog

2019-02-21 18:42:06 +01:00

SettingCheckBox.qml

Ensure bool and enum settings get control highlighted on hover

2019-08-27 13:38:55 +02:00

SettingComboBox.qml

Update intents model to use container tree

2019-08-29 13:53:23 +02:00

SettingExtruder.qml

Code style

2019-01-23 11:11:40 +01:00

SettingItem.qml

Make reset button and revert stack levels configurable

2019-05-28 10:33:26 +02:00

SettingOptionalExtruder.qml

Spelling fix: Overriden -> Overridden

2019-04-04 14:39:01 +02:00

SettingTextField.qml

Revert "Settings-GUI: Max decimal places to 4 (from 3)."

2019-05-28 11:33:17 +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

Capitalise the S

2019-09-19 10:47:16 +02:00