3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-22 22:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
Cura/resources/qml/Dialogs
History
Ghostkeeper 7df4c01814
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	cura/Settings/MachineManager.py -> rowCount vs. count
	resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten.
	resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed.
	resources/qml/Toolbar.qml -> Git was wrong, not a conflict.
	resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.
2018-12-03 11:45:05 +01:00
..
AboutDialog.qml Fix code style 2018-10-18 14:30:33 +02:00
AddMachineDialog.qml Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 2018-12-03 11:45:05 +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