← Back to team overview

widelands-dev team mailing list archive

Thread
Date

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

To: mp+211225@xxxxxxxxxxxxxxxxxx
From: Jens Beyer <Qcumber-some@xxxxxxxxxxxxx>
Date: Mon, 17 Mar 2014 15:03:07 -0000
In-reply-to: <20140316215322.6364.23226.launchpad@ackee.canonical.com>
Reply-to: mp+211225@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Looks like this branch does not merge into trunk without conflicts around the Barbarian ferner?
-- 
https://code.launchpad.net/~widelands-dev/widelands/spritemaps/+merge/211225
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/spritemaps into lp:widelands.

Follow ups

Re: [Merge] lp:~widelands-dev/widelands/spritemaps into lp:widelands
From: SirVer, 2014-03-17

References

[Merge] lp:~widelands-dev/widelands/spritemaps into lp:widelands
From: SirVer, 2014-03-16