larsbrubaker 66b5844c99 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development ... Conflicts: StaticData/Translations/Master.txt		2014-10-13 10:58:48 -07:00
..
SlicePresetsWindow
SlicerMapping
ActiveSliceSettings.cs
CuraEngineInfo.cs
MatterSliceInfo.cs
SettingsControlBar.cs
SettingsControlSelectors.cs
Slic3rInfo.cs
SliceEngineInfo.cs
SliceSettingsLayerSelector.cs
SliceSettingsOrganizer.cs
SliceSettingsWidget.cs
SliceSettingsWidgetUiState.cs
SlicingQueue.cs