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
..
MenuRow	Putting progress bar on macro window.	2016-12-04 18:13:58 -08:00
AdvancedControlsPanel.cs	Don't save close state on reload of settings	2016-11-07 13:54:49 -08:00
CompactSlidePanel.cs	Merge branch 'master' of https://github.com/MatterHackers/MatterControl	2016-05-07 20:30:25 -07:00
FirstPanelTabView.cs	Putting Selection List into QueueData	2016-12-04 12:06:51 -08:00
MainApplicationWidget.cs	Ensure 'Import Printers' window appears after authentication	2016-11-30 13:44:31 -08:00
TouchscreenTabView.cs	Putting Selection List into QueueData	2016-12-04 12:06:51 -08:00
WidescreenPanel.cs	Convert lastNumberOfVisiblePanels to instance member	2016-10-07 09:07:50 -07:00