Ghostkeeper 266e08fdff Merge branch 'master' into ui_rework_4_0 ... Conflicts: plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml - The compatibility chart being added in 3.6 which was kind of hacky. resources/qml/SidebarHeader.qml - Removed in UI rework, edited on master.		2018-11-13 16:23:36 +01:00
..
resources	Merge branch 'master' into ui_rework_4_0	2018-11-13 16:23:36 +01:00
src	Merge branch 'master' into CURA-5840-make-plugin-sdk-use-semantic-versioning	2018-11-13 13:16:22 +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