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
..
CustomPrintSetup.qml	Fix remaining merge conflicts	2022-01-31 17:08:56 +01:00
MenuButton.qml	Replace usage of controls label with our custom label	2021-11-10 16:37:26 +01:00
QualitiesWithIntentMenu.qml	Use custom scroll bar for qualities+intents menu	2022-01-19 14:47:55 +01:00