Lars Brubaker 12bca2d0c5 Merge branch 'master' of https://github.com/MatterHackers/MatterControl ... Conflicts: StaticData/Translations/Master.txt		2016-06-13 15:30:57 -07:00
..
agg-sharp@a78c996079	Merge branch 'master' of https://github.com/MatterHackers/MatterControl	2016-06-13 15:30:57 -07:00
MatterSlice@354898155f	Got the new printer setup wizards back to working.	2016-06-07 14:27:37 -07:00