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. _______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
