Cura/resources/qml/Preferences
casper 5a2e26eff6 Merge branch 'replace_controls_1_for_controls_2' into CURA-8685-replace_text_and_progress_bars
# Conflicts:
#	plugins/PerObjectSettingsTool/PerObjectItem.qml
#	plugins/PerObjectSettingsTool/SettingPickDialog.qml
2022-02-18 09:07:25 +01:00
..
Materials Merge branch 'replace_controls_1_for_controls_2' into CURA-8685-replace_text_and_progress_bars 2022-02-18 09:07:25 +01:00
GeneralPage.qml Swap out the GeneralPage items to use the themed ones 2022-02-15 16:11:06 +01:00
MachinesPage.qml Update UM.ConfirmRemoveDialog 2022-02-07 21:23:17 +01:00
ProfilesPage.qml Fix ProfilesPage 2022-02-07 22:03:37 +01:00
ReadOnlyTextArea.qml Simpify Readonly textarea 2022-02-15 15:18:04 +01:00
SettingVisibilityPage.qml Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-17 15:02:03 +01:00