← Back to team overview

widelands-dev team mailing list archive

Thread
Date

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

To: mp+327062@xxxxxxxxxxxxxxxxxx
From: GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>
Date: Tue, 19 Dec 2017 16:58:03 -0000
In-reply-to: <149959504319.10665.7802720757681149580.launchpad@ackee.canonical.com>
Reply-to: mp+327062@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

I just had a merge conflict while merging trunk. @kaputtnik, could you please check if the documentation for lua_map is still OK and then merge?
-- 
https://code.launchpad.net/~widelands-dev/widelands/reveal_hide_animations/+merge/327062
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1687100-reveal_fields.

References

[Merge] lp:~widelands-dev/widelands/reveal_hide_animations into lp:widelands
From: kaputtnik, 2017-07-09