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
..
resources	Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown	2018-11-27 15:01:48 +01:00
src	Compare SDK version as Version instances	2018-11-15 15:20:21 +01:00
__init__.py	CURA-5330 Fix code style and typing in Toolbox plugin	2018-06-13 18:22:27 +02:00
plugin.json	Increase plugin API version to 5	2018-08-27 13:59:00 +02:00