Lars Brubaker aa7445b618 Merge remote-tracking branch 'origin/1.7' into design_tools ... # Conflicts: # StaticData/Translations/Master.txt		2017-04-11 13:25:42 -07:00
..
MatterControl.AutomationTests	Merge remote-tracking branch 'origin/1.7' into design_tools	2017-04-11 13:25:42 -07:00
MatterControl.Tests	adressing: MatterHackers/MatterControl#2000	2017-03-21 14:26:54 -07:00
TestData
MatterControl.nunit	Revise assembly paths	2016-07-29 15:21:30 -07:00
MatterControlAutomation.nunit