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

Fix key in metadata

2016-03-22 15:05:22 +01:00

SolidView.py

Removing unused imports

2016-03-15 12:57:03 +01:00