Please make smaller commits. You merged trunk, that needs to be a separate commit. I now have to wade through all of those changes that are completely unrelated to this branch to get at the actual changes :(
So: - Merge trunk: commit - Changes to scenario - commit - Fix unit names and helptexts - commit -- https://code.launchpad.net/~widelands-dev/widelands/frisians/+merge/336910 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/frisians. _______________________________________________ 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
