← Back to team overview

widelands-dev team mailing list archive

Thread
Date

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

To: mp+255132@xxxxxxxxxxxxxxxxxx
From: GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>
Date: Thu, 07 May 2015 20:46:59 -0000
In-reply-to: <20150402192321.2165.42293.launchpad@ackee.canonical.com>
Reply-to: mp+255132@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Kick out my changes then, maybe I made a mistake that's not obvious.

BTW I just noticed some <<<<<<< TREE ... >>>>>>> MERGE-SOURCE in the current diff ;)
-- 
https://code.launchpad.net/~widelands-dev/widelands/militarysites_tweaks/+merge/255132
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/militarysites_tweaks into lp:widelands.

References

[Merge] lp:~widelands-dev/widelands/militarysites_tweaks into lp:widelands
From: TiborB, 2015-04-02