Ghostkeeper ee81326d6a Fix remaining merge conflicts ... - When both branches added Controls1 as OldControls, it's not marked as a merge conflict. But the merge removed the need for OldControls, so the import can be removed. - There was one instance where I had removed the OldControls for a checkbox but there it should remain since the checkboxes are updated in a separate ticket. Contributes to issue CURA-8684.		2022-01-31 17:08:56 +01:00
..
Custom	Fix remaining merge conflicts	2022-01-31 17:08:56 +01:00
Recommended	Fix remaining merge conflicts	2022-01-31 17:08:56 +01:00
NoIntentIcon.qml	Unrevert new icon set for all of Cura's interface	2021-06-28 17:16:56 +02:00
PrintSetupSelector.qml	Set header border and color by default in ExpandablePopup and Component	2021-07-01 14:20:57 +02:00
PrintSetupSelectorContents.qml	Fix various typos	2021-09-07 11:33:54 -04:00
PrintSetupSelectorHeader.qml	Use medium_button instead of toolbar_button	2021-07-01 10:02:09 +02:00