mattercontrol/SetupWizard
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
..
AndroidConnectDevicePage.cs Moved Mocros to the top of the controls window 2016-11-30 13:31:19 -08:00
AndroidSetupOptionsPage.cs Moved Mocros to the top of the controls window 2016-11-30 13:31:19 -08:00
CopyGuestProfilesToUser.cs Ensure 'Import Printers' window appears after authentication 2016-11-30 13:44:31 -08:00
EditPrinterSettingsPage.cs Moved Mocros to the top of the controls window 2016-11-30 13:31:19 -08:00
ExportSettingsPage.cs Moved Mocros to the top of the controls window 2016-11-30 13:31:19 -08:00
ImportSettingsPage.cs Moved Mocros to the top of the controls window 2016-11-30 13:31:19 -08:00
LicenseAgreementPage.cs Moved Mocros to the top of the controls window 2016-11-30 13:31:19 -08:00
PrinterProfileHistoryPage.cs Moved Mocros to the top of the controls window 2016-11-30 13:31:19 -08:00
SetupWizardTroubleshooting.cs Moved Mocros to the top of the controls window 2016-11-30 13:31:19 -08:00
SetupWizardWifi.cs Moved Mocros to the top of the controls window 2016-11-30 13:31:19 -08:00
SyncingPrintersPage.cs Make sure we close if multiple printers 2016-12-07 15:49:06 -08:00
WizardPage.cs Moved Mocros to the top of the controls window 2016-11-30 13:31:19 -08:00
WizardWindow.cs Make sure we can raise keyboard on wizard windows 2016-11-08 14:56:42 -08:00