I think i didn't have the rights to merge with trunk... I look into the conflicts. Thanks :-) -- https://code.launchpad.net/~widelands-dev/widelands/missing_worker_animations/+merge/281365 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/missing_worker_animations.
_______________________________________________ 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
