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
..
Properties
app.config	Update to framework 4.6.1	2017-03-15 14:45:14 -07:00
CheckBoxInLibraryIsClickable.cs	Refactor wait to delay	2017-02-01 10:12:31 -08:00
CreateLibraryFolder.cs	Refactor wait to delay	2017-02-01 10:12:31 -08:00
ExportItemWindowTests.cs	Refactor wait to delay	2017-02-01 10:12:31 -08:00
FileMenuTest.cs	Refactor wait to delay	2017-02-01 10:12:31 -08:00
HardwareLevelingUITests.cs	Refactor wait to delay	2017-02-01 10:12:31 -08:00
LibraryDownloadsTest.cs	Refactor wait to delay	2017-02-01 10:12:31 -08:00
LocalLibraryTests.cs	Fixed the library print test to not hang	2017-04-11 11:51:21 -07:00
MatterControl.AutomationTests.csproj	Design tools	2017-03-15 16:29:56 -07:00
OptionsTabTests.cs	Refactor wait to delay	2017-02-01 10:12:31 -08:00
packages.config	Revert to NUnit 3.5	2017-02-07 11:47:57 -08:00
PartPreviewTests.cs	Design tools	2017-03-15 16:29:56 -07:00
PrinterDropDownTests.cs	Refactor wait to delay	2017-02-01 10:12:31 -08:00
PrintingTests.cs	Tuning adjustments default to 1.0 on application restart	2017-03-09 12:46:06 -08:00
PrintQueueTests.cs	Design tools	2017-03-15 16:29:56 -07:00
SliceSettingsTests.cs	Design tools	2017-03-15 16:29:56 -07:00
SlicingTests.cs
SqLiteLibraryProvider.cs	Design tools	2017-03-15 16:29:56 -07:00