Lars Brubaker 352eb792f1 Merge branch 'smash_1.7.1' into design_tools ... # Conflicts: # PartPreviewWindow/View3D/View3DWidget.cs # SlicerConfiguration/SliceSettingsWidget.cs # SlicerConfiguration/SlicingQueue.cs # StaticData/SliceSettings/Properties.json		2017-05-19 14:57:04 -07:00
..
Slicing	Making android not connect to unspecified printer	2016-09-28 15:31:40 -07:00
BrailleGrade2Tests.cs	Remove nunit from production code	2016-11-14 11:46:32 -08:00
GCodeProcessingTests.cs	adressing: MatterHackers/MatterControl#2000	2017-03-21 14:26:54 -07:00
GCodeStreamTests.cs	Tuning adjustments default to 1.0 on application restart	2017-03-09 12:46:06 -08:00
HtmlParser.cs
ImportSettingsTests.cs	Made importing a quality setting set the name correctly.	2016-11-07 12:41:05 -08:00
LevelingTests.cs	All new 1.7.1 changes	2017-05-19 14:39:57 -07:00
LibraryProviderSqliteTests.cs	Restore disabled automation tests	2016-11-03 09:53:22 -07:00
LibraryProviderTests.cs	Fixing tests	2017-03-01 17:05:48 -08:00
MatterControlUiFeatures.cs	Switch to RequiresSTA replacement attribute	2016-09-21 15:34:53 -07:00
MatterControlUtilities.cs	Design tools	2017-03-15 16:29:56 -07:00
OemProfileTests.cs	Add LayerGCodeHasExpectedValue test	2016-12-20 10:45:32 -08:00
PerformanceTests.cs	Design tools	2017-03-15 16:29:56 -07:00
PrinterChooserUnitTests.cs	Restore disabled automation tests	2016-11-03 09:53:22 -07:00
PrinterConfigurationTests.cs	Use correct Assert method	2016-12-05 16:10:54 -08:00
PrinterWhiteListTests.cs	Upgrade to NUnit3	2016-09-21 14:13:39 -07:00
ReleaseBuildTests.cs	Design tools	2017-03-15 16:29:56 -07:00
SettingsParseTests.cs	All new 1.7.1 changes	2017-05-19 14:39:57 -07:00
TranslationsTests.cs	Upgrade to NUnit3	2016-09-21 14:13:39 -07:00