widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

I merged trunk in the other branch, so if you could merge that first, I can then take care of any remaining conflicts.

I made the mistake of first splitting off this branch and then merging trunk into the other
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1343302_codecheck/+merge/228357
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1343302_codecheck.