Lars Brubaker 519ad7045d Merge branch 'master' of https://github.com/MatterHackers/MatterControl ... Conflicts: SlicerConfiguration/SliceSettingsWidget.cs		2016-05-17 09:44:05 -07:00
..
agg-sharp@f95a322016	Merge branch 'master' of https://github.com/MatterHackers/MatterControl	2016-05-17 09:44:05 -07:00
MatterSlice@834a361f48	Working on better printer editing behavior	2016-05-16 17:11:49 -07:00