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
..
ApplicationMenuRow.cs
MenuBase.cs
MenuOptionFile.cs
MenuOptionHelp.cs	Added automated test to ensure that setting values are being passed to MatterSlice with the correct values. Also added a stress test in slice settings.	2016-03-03 16:57:43 -08:00
MenuOptionSettings.cs	Merge branch '1.5.2'	2016-04-14 15:42:42 -07:00