Cura/resources/qml/Dialogs
Daniel Schiavini a1c252d3a2 Revert "Revert "fix merge conflict""
This reverts commit 4bffa6d90f.
2018-12-07 10:25:46 +01:00
..
AboutDialog.qml Revert "Revert "fix merge conflict"" 2018-12-07 10:25:46 +01:00
AddMachineDialog.qml Revert "Revert "fix merge conflict"" 2018-12-07 10:25:46 +01:00
AskOpenAsProjectOrModelsDialog.qml Store the dialogs in a folder called Dialogs. 2018-10-09 17:11:01 +02:00
DiscardOrKeepProfileChangesDialog.qml Store the dialogs in a folder called Dialogs. 2018-10-09 17:11:01 +02:00
OpenFilesIncludingProjectsDialog.qml Store the dialogs in a folder called Dialogs. 2018-10-09 17:11:01 +02:00
WorkspaceSummaryDialog.qml Merge branch 'master' into cura4.0_header 2018-10-17 16:10:45 +02:00