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
..
agg-sharp@78d9ca2875	Merge branch 'master' of https://github.com/MatterHackers/MatterControl	2016-09-01 11:18:32 -07:00
MatterSlice@df065b1e83	Fixed a problem with create new printer	2016-08-31 12:49:25 -07:00