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
..
ActionPanelWidget.qml	Apply restyle of the toolbar according to the new designs.	2018-11-11 19:15:02 +01:00
OutputDevicesActionButton.qml	Move default margin by default to Cura's action buttons	2018-11-20 14:19:55 +01:00
OutputProcessWidget.qml	Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown	2018-11-26 13:43:20 +01:00
PrintInformationWidget.qml	Add soft animation to the entire popup and not only in the background.	2018-11-11 13:17:59 +01:00
PrintJobInformation.qml	Remove functions that are only used once.	2018-11-02 16:52:17 +01:00
SliceProcessWidget.qml	Give action button a sane default height	2018-11-20 14:34:06 +01:00