← Back to team overview

widelands-dev team mailing list archive

Thread
Date

Re: [Merge] lp:~widelands-dev/widelands/fh1 into lp:widelands

To: cghislai <charlyghislain@xxxxxxxxx>
From: kaputtnik <somal@xxxxxxxx>
Date: Sun, 03 Jul 2016 10:35:32 -0000
In-reply-to: <20130726220223.12881.46722.launchpad@ackee.canonical.com>
Reply-to: mp+177228@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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.

References

[Merge] lp:~widelands-dev/widelands/fh1 into lp:widelands
From: cghislai, 2013-07-26