3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 21:44:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
Cura/resources/qml/Preferences
History
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
..
Materials Fix remaining merge conflicts 2022-01-31 17:08:56 +01:00
GeneralPage.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
MachinesPage.qml Update resources/qml/Preferences/MachinesPage.qml 2022-01-25 22:38:02 +01:00
ProfilesPage.qml Fix remaining merge conflicts 2022-01-31 17:08:56 +01:00
ReadOnlySpinBox.qml Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
ReadOnlyTextArea.qml Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
ReadOnlyTextField.qml Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
SettingVisibilityPage.qml Replace old ScrollView with new ListView 2022-01-18 18:43:27 +01:00