j.delarago e2fe50baf1 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup ... # Conflicts: # resources/qml/Widgets/Menu.qml # resources/qml/Widgets/MenuItem.qml # resources/themes/cura-dark/theme.json # resources/themes/cura-light/theme.json		2022-02-28 08:51:42 +01:00
..
Materials	Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup	2022-02-28 08:51:42 +01:00
GeneralPage.qml	Make general menu combox wider	2022-02-23 15:13:36 +01:00
MachinesPage.qml	Remove id left over from copy paste	2022-02-21 10:05:09 +01:00
ProfilesPage.qml	Replace UM.MessageDialog with newly added Cura.MessageDialog	2022-02-23 14:09:38 +01:00
ReadOnlyTextArea.qml	Simpify Readonly textarea	2022-02-15 15:18:04 +01:00
SettingVisibilityPage.qml	Remove id left over from copy paste	2022-02-21 10:05:09 +01:00