Ghostkeeper 289399825b Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown ... Conflicts: plugins/PrepareStage/PrepareMenu.qml: Git was wrong, this was not really a conflict. resources/qml/ActionButton.qml: With iconSource being modified on ui_rework_4_0 and me modifying the icon to be able to display it on the left hand side. resources/qml/ActionPanel/OutputProcessWidget.qml: Git was wrong, not really a conflict. resources/qml/ActionPanel/SliceProcessWidget.qml: Git was wrong, not really a conflict. resources/qml/ExpandableComponent.qml: Both ui_rework_4_0 and me implemented a border around popups. resources/qml/MainWindow/MainWindowHeader.qml: Git was wrong, not really a conflict. resources/themes/cura-light/theme.json: Theme item was added in a place where I added whitespace.		2018-11-27 15:01:48 +01:00
..
ActionPanelWidget.qml	Apply restyle of the toolbar according to the new designs.	2018-11-11 19:15:02 +01:00
OutputDevicesActionButton.qml	Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown	2018-11-27 15:01:48 +01:00
OutputProcessWidget.qml	Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown	2018-11-27 15:01:48 +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	Change all uses of 'small' and 'very small' fonts to default	2018-11-26 17:33:37 +01:00
SliceProcessWidget.qml	Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown	2018-11-27 15:01:48 +01:00