Ghostkeeper 0684cee681 Merge branch '2.1' ... Conflicts: resources/machines/fdmprinter.json resources/machines/innovo-inventor.json resources/profiles/general/High+Quality.cfg resources/profiles/general/Low+Quality.cfg resources/profiles/general/Normal+Quality.cfg resources/profiles/general/Ulti+Quality.cfg resources/profiles/ultimaker2+/pla_0.4_high.curaprofile		2016-04-04 18:49:09 +02:00
..
__init__.py	Add period at end of plug-in description	2016-03-22 15:10:57 +01:00
ChangeLog.py	Marking unused variable	2016-03-15 12:25:10 +01:00
ChangeLog.qml	Add internationalisation for ChangeLog plug-in	2016-03-22 15:38:01 +01:00
ChangeLog.txt	Adds naming changes to the changelog	2015-11-19 15:43:20 +01:00