Seems to me that this branch is some kind incompatible with trunk... i get 186 conflicts when i try to merge trunk.
So what is the state here? Should we unlink the bugs? I have removed the links to "fix commited" bugs. -- https://code.launchpad.net/~widelands-dev/widelands/fh1/+merge/177228 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1. _______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
