Lars Brubaker ac157577bd Merge branch 'design_tools' of https://github.com/MatterHackers/MatterControl into design_tools ... # Conflicts: # Submodules/agg-sharp		2017-05-24 08:15:00 -07:00
..
agg-sharp@27fe3e2335	Merge branch 'design_tools' of https://github.com/MatterHackers/MatterControl into design_tools	2017-05-24 08:15:00 -07:00
MatterSlice@af0b11a2bc	Fixed CancelingNormalPrintTurnsHeatAndFanOff	2017-05-19 17:18:21 -07:00