larsbrubaker f1f1dac568 Merge remote-tracking branch 'origin/1.3.0' ... Conflicts: StaticData/PrinterSettings/Me3D/Me2/material/PolyPlusLT.slice Make it clear this is an out not a ref.		2015-07-28 11:51:35 -07:00
..
agg-sharp@625d71a6c7	Merge remote-tracking branch 'origin/1.3.0'	2015-07-28 11:51:35 -07:00
MatterSlice@60fecab9a5	Latest ms.	2015-07-20 22:05:14 -07:00