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
..
MaterialsBrandSection.qml	Replace usage of controls label with our custom label	2021-11-10 16:37:26 +01:00
MaterialsDetailsPanel.qml	Revert "Cura 7813 qml modules version bump"	2021-03-30 09:48:28 +02:00
MaterialsList.qml	Remove unneded styles import	2022-01-04 09:48:02 +01:00
MaterialsPage.qml	Merge branch 'replace_controls_1_for_controls_2' into CURA-8684_QtControls_replacement_Buttons,_Actions_&_'Exclusivity'	2022-01-31 16:53:45 +01:00
MaterialsSlot.qml	Update materials slot preference menu to QtControls 2	2022-01-24 23:34:38 +01:00
MaterialsSyncDialog.qml	Use new ScrollBar for material sync dialogue	2022-01-18 19:10:06 +01:00
MaterialsTypeSection.qml	Replace usage of controls label with our custom label	2021-11-10 16:37:26 +01:00
MaterialsView.qml	Fix remaining merge conflicts	2022-01-31 17:08:56 +01:00