Lipu Fei 17c93dea80 Fix merge conflicts with 4.0		2018-12-13 14:39:28 +01:00
..
resources	Reuse the primary button in the toolbox for the "Quit Cura" button	2018-12-13 09:41:07 +01:00
src	Fix merge conflicts	2018-12-12 13:26:01 +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