Jaime van Kessel 92a4fd7239 Materials are now also handled in conflict resolvement ...

CURA-1263

2016-11-17 11:16:15 +01:00

..

__init__.py

Mark XmlMaterialProfile as type "material" so the import/export code can find it

2016-07-07 01:42:39 +02:00

XmlMaterialProfile.py

Materials are now also handled in conflict resolvement

2016-11-17 11:16:15 +01:00