Lipu Fei 7f7a195627 Fix merge conflicts from 3.4

2018-06-05 09:02:52 +02:00

..

__init__.py

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

ChangeLog.py

CURA-5164 The Preferences is not a singleton class anymore since in some point

2018-05-11 08:50:42 +02:00

ChangeLog.qml

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

ChangeLog.txt

Update 3.4 changelog

2018-06-04 15:39:47 +02:00

plugin.json

Set author to Ultimaker B.V. instead of Ultimaker

2017-06-28 13:50:37 +02:00