Jelle Spijker 0f0d729549 Merge branch '5.4' ... # Conflicts: # conanfile.py # resources/i18n/cs_CZ/fdmprinter.def.json.po # resources/i18n/de_DE/fdmprinter.def.json.po # resources/i18n/es_ES/fdmprinter.def.json.po # resources/i18n/fdmprinter.def.json.pot # resources/i18n/fi_FI/fdmprinter.def.json.po # resources/i18n/fr_FR/fdmprinter.def.json.po # resources/i18n/hu_HU/fdmprinter.def.json.po # resources/i18n/it_IT/fdmprinter.def.json.po # resources/i18n/ja_JP/fdmprinter.def.json.po # resources/i18n/ko_KR/fdmprinter.def.json.po # resources/i18n/nl_NL/fdmprinter.def.json.po # resources/i18n/pl_PL/fdmprinter.def.json.po # resources/i18n/pt_BR/fdmprinter.def.json.po # resources/i18n/pt_PT/fdmprinter.def.json.po # resources/i18n/ru_RU/fdmprinter.def.json.po # resources/i18n/tr_TR/fdmprinter.def.json.po # resources/i18n/zh_CN/fdmprinter.def.json.po # resources/i18n/zh_TW/fdmprinter.def.json.po		2023-06-08 12:36:46 +02:00
..
Custom	Make the width of the ProfileWarningREset 0 when it is hidden.	2022-12-06 18:11:15 +01:00
Recommended	Merge branch '5.4'	2023-06-08 12:36:46 +02:00
PrintSetupSelector.qml	Fix size of print setup selector	2022-04-19 16:42:43 +02:00
PrintSetupSelectorContents.qml	Add resize handle to recommended window	2023-02-24 14:28:13 +01:00
PrintSetupSelectorHeader.qml	Unify activeQualityDisplayNameMap string creation	2022-11-25 16:09:55 +01:00
ProfileWarningReset.qml	Make the width of the ProfileWarningREset 0 when it is hidden.	2022-12-06 18:11:15 +01:00