larsbrubaker 85771ced2a Merge branch 'master' of https://github.com/MatterHackers/MatterControl ... # Conflicts: # SlicerConfiguration/SettingsControlSelectors.cs		2016-05-07 20:30:25 -07:00
..
MenuRow	Moved TextWidget.GlobalPointSizeScaleRatio -> GuiWidget.DeviceScale	2016-05-06 17:56:27 -07:00
AdvancedControlsPanel.cs	Working to make the icons scale better on high res screens.	2016-05-07 17:18:05 -07:00
CompactSlidePanel.cs	Merge branch 'master' of https://github.com/MatterHackers/MatterControl	2016-05-07 20:30:25 -07:00
CompactTabView.cs	Json Profiles	2016-04-27 14:35:57 -07:00
FirstPanelTabView.cs	Made the about window always on top	2015-05-20 10:55:14 -07:00
MainApplicationWidget.cs	Get updated profiles compiling on Android	2016-05-05 12:33:39 -07:00
WidescreenPanel.cs	Moved TextWidget.GlobalPointSizeScaleRatio -> GuiWidget.DeviceScale	2016-05-06 17:56:27 -07:00