Lars Brubaker 4bb141339e Merge branch '1.5.2' ... Conflicts: ApplicationView/MenuRow/MenuOptionSettings.cs StaticData/Translations/Master.txt		2016-04-14 15:42:42 -07:00
..
Calibration - Box.stl
Calibration - Circle.stl
MatterControl - Coin.stl
MatterControl - Stand.stl	Temporary hack to make sure that the T7 stand is included in preloaded library parts	2016-03-29 11:41:02 -07:00
MatterControl - Stand10.stl	Temporary hack to make sure that the T7 stand is included in preloaded library parts	2016-03-29 11:41:02 -07:00