Lars Brubaker dbd2c20398 Merge branch '1.6' ... # Conflicts: # SlicerConfiguration/Settings/ProfileManager.cs # Tests/MatterControl.AutomationTests/PrintQueueTests.cs # Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs		2016-12-07 16:14:56 -08:00
..
MatterControl.AutomationTests	Merge branch '1.6'	2016-12-07 16:14:56 -08:00
MatterControl.Tests	Merge branch '1.6'	2016-12-07 16:14:56 -08:00
TestData	Added Automated unit tests for Exporting GCode from the Downloads folder and for adding zip files to the Downloads Folder I flagged it to be Ignored currently but they are nearly done	2015-12-31 12:57:00 -08:00
MatterControl.nunit	Revise assembly paths	2016-07-29 15:21:30 -07:00
MatterControlAutomation.nunit	Migrate test runner to build tools	2015-12-17 12:20:41 -08:00