Lars Brubaker 4929f834d6 Merge branch 'master' of https://github.com/MatterHackers/MatterControl ... Conflicts: SlicerConfiguration/Settings/ProfileManager.cs		2016-09-01 11:18:32 -07:00
..
ActiveSliceSettings.cs	Made the settings history be disabled when not signed in.	2016-08-31 13:09:06 -07:00
GCodeMacro.cs	Extract classes to separate files	2016-06-16 16:51:32 -07:00
PrinterSettings.cs	Skip save operation when on the EmptyProfile	2016-08-31 18:49:29 -07:00
PrinterSettingsLayer.cs	Made the name save in settings editor	2016-08-10 14:04:33 -07:00
ProfileManager.cs	Merge branch 'master' of https://github.com/MatterHackers/MatterControl	2016-09-01 11:18:32 -07:00
ProfileMigrations.cs	Changed the theme colors to save by name	2016-08-31 11:42:02 -07:00
SettingsDiagram.cd	Renamed SettingsProflie to SettingsHelpers	2016-07-19 13:28:10 -07:00
SettingsHelpers.cs	Fix issues in ChangeID	2016-08-31 13:57:51 -07:00