Lars Brubaker c3f434fe3e Merge branch 'master' of https://github.com/MatterHackers/MatterControl ... # Conflicts: # MatterControl.Printing/Settings/PrinterSettingsLayer.cs # MatterControlLib/SlicerConfiguration/Settings/ProfileManager.cs		2020-11-02 18:24:19 -08:00
..
HistoryListView.cs	Put in ratings and note	2020-07-11 23:08:42 -07:00
PrintHistoryData.cs	Making print history clearable and update with new data	2020-07-03 12:05:37 -07:00
PrintHistoryEditor.cs	Merge branch 'master' of https://github.com/MatterHackers/MatterControl	2020-11-02 18:24:19 -08:00
PrintHistoryListItem.cs	fixing spelling	2020-10-26 10:08:38 -07:00
PrintRecovery.cs	Make it easier to turn on and off working with the test server	2020-10-23 16:57:26 -07:00