larsbrubaker 374edca7ce Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development ... Conflicts: SlicerConfiguration/SlicingQueue.cs StaticData/Translations/Master.txt		2014-10-19 20:15:12 -07:00
..
Layouts.txt	Made export do conversion when required.	2014-10-17 18:45:15 -07:00
Properties.txt	Made exporting to a single extruder put in all the meshes.	2014-10-19 20:10:02 -07:00