Conflicts: ApplicationView/MenuRow/MenuOptionSettings.cs StaticData/Translations/Master.txt |
||
|---|---|---|
| .. | ||
| SlicePresetDetailWidget.cs | ||
| SlicePresetListWidget.cs | ||
| SlicePresetsWindow.cs | ||
Conflicts: ApplicationView/MenuRow/MenuOptionSettings.cs StaticData/Translations/Master.txt |
||
|---|---|---|
| .. | ||
| SlicePresetDetailWidget.cs | ||
| SlicePresetListWidget.cs | ||
| SlicePresetsWindow.cs | ||