widelands-dev team mailing list archive

Thread
Date

Re: [Merge] lp:~alocritani/widelands/resource_info_in_editor into lp:widelands

To: mp+98150@xxxxxxxxxxxxxxxxxx
From: SirVer <SirVer@xxxxxx>
Date: Mon, 19 Mar 2012 21:40:24 -0000
In-reply-to: <20120319060818.24765.85864.launchpad@ackee.canonical.com>
Reply-to: mp+98150@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

The reason is the following: I merged it and forgot to push, then someone else commited stuff to trunk. So I rebase and somehow some metadata of the merge got lost.

It is completly in trunk though. Also: thanks for including the help.lua into catalogues - I somehow missed this.
-- 
https://code.launchpad.net/~alocritani/widelands/resource_info_in_editor/+merge/98150
Your team Widelands Developers is requested to review the proposed merge of lp:~alocritani/widelands/resource_info_in_editor into lp:widelands.

References

[Merge] lp:~alocritani/widelands/resource_info_in_editor into lp:widelands
From: Angelo Locritani, 2012-03-19