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
..
AboutDialog.qml	Use styled scroll bar, and no ScrollView	2022-01-18 17:51:37 +01:00
AskOpenAsProjectOrModelsDialog.qml	Update ask open project or models dialog to QtControls 2	2022-01-24 21:58:23 +01:00
DiscardOrKeepProfileChangesDialog.qml	Fix remaining merge conflicts	2022-01-31 17:08:56 +01:00
OpenFilesIncludingProjectsDialog.qml	Update resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml	2022-01-27 16:03:58 +01:00
WorkspaceSummaryDialog.qml	Use correct scrollbar and clip contents	2022-01-18 17:56:31 +01:00