Lars Brubaker 32de0942ca Merge branch 'master' of https://github.com/MatterHackers/MatterControl ... Conflicts: DataStorage/Classic/ClassicSqlitePrinterProfiles.cs		2016-07-14 11:39:19 -07:00
..
MenuRow	Describe named action lists as menuActions rather than menuItems	2016-06-11 17:21:59 -07:00
AdvancedControlsPanel.cs	Merge	2016-07-14 11:19:13 -07:00
CompactSlidePanel.cs	Merge branch 'master' of https://github.com/MatterHackers/MatterControl	2016-05-07 20:30:25 -07:00
FirstPanelTabView.cs	Made the about window always on top	2015-05-20 10:55:14 -07:00
MainApplicationWidget.cs	Merge branch 'master' of https://github.com/MatterHackers/MatterControl	2016-07-14 11:39:19 -07:00
TouchscreenTabView.cs	Merge	2016-07-14 11:19:13 -07:00
WidescreenPanel.cs	Merge	2016-07-14 11:19:13 -07:00