Conflicts: ApplicationView/MenuRow/MenuOptionSettings.cs StaticData/Translations/Master.txt |
||
|---|---|---|
| .. | ||
| ApplicationMenuRow.cs | ||
| MenuBase.cs | ||
| MenuOptionFile.cs | ||
| MenuOptionHelp.cs | ||
| MenuOptionSettings.cs | ||
Conflicts: ApplicationView/MenuRow/MenuOptionSettings.cs StaticData/Translations/Master.txt |
||
|---|---|---|
| .. | ||
| ApplicationMenuRow.cs | ||
| MenuBase.cs | ||
| MenuOptionFile.cs | ||
| MenuOptionHelp.cs | ||
| MenuOptionSettings.cs | ||