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
..
png	Merge branch '4.8'	2020-11-10 11:31:53 +01:00
qml	Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup	2022-02-28 08:51:42 +01:00
svg	Use image instead of custom message type	2021-10-05 10:20:52 +02:00