[Warzone2100-project] [Warzone 2100 Trac] #3963: who can help you?

#3963: who can help you? +-- Reporter: Rummelbummel stormdevl@… | Owner: Type: bug |Status: new Priority: normal | Milestone:

[Warzone2100-project] [Warzone 2100 Trac] #3964: Visual Studio build - cannot build bugfixes branch and master+Release

#3964: Visual Studio build - cannot build bugfixes branch and master+Release -+- Reporter: Reg312 | Owner: Type: bug |Status: new Priority: normal |

[Warzone2100-project] Automerging bugfixes to 3.1 failed!

Auto-merging po/zh_TW.po CONFLICT (content): Merge conflict in po/zh_TW.po Auto-merging po/zh_CN.po CONFLICT (content): Merge conflict in po/zh_CN.po Auto-merging po/uk_UA.po CONFLICT (content): Merge conflict in po/uk_UA.po Auto-merging po/tr.po CONFLICT (content): Merge conflict in po/tr.po