Ghostkeeper 826044da7e Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown ... Conflicts: plugins/PrepareStage/PrepareMenu.qml: Some indentation change caused it to misalign the diffs, thinking it couldn't merge two of the same lines which actually weren't the same lines. resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml: This file was deleted in my branch. I'm holding for the new version.		2018-11-26 13:43:20 +01:00
..
cura-dark	Make some tweaks in the UI for the preview stage.	2018-11-11 14:06:52 +01:00
cura-light	Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown	2018-11-26 13:43:20 +01:00