← Back to team overview

widelands-dev team mailing list archive

Thread
Date

Re: [Merge] lp:~tiborb95/widelands/tiborb-ai into lp:widelands

To: mp+219750@xxxxxxxxxxxxxxxxxx
From: Tibor Bamhor <tiborb95@xxxxxxxxx>
Date: Fri, 16 May 2014 20:12:35 -0000
In-reply-to: <20140516014416.25493.16324.codereview@chaenomeles.canonical.com>
Reply-to: mp+219750@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Well, I got lost.

I just merged trunk into my branch,resolved conflict and commited revision 6974. But it is nowhere here. Please help :)
-- 
https://code.launchpad.net/~tiborb95/widelands/tiborb-ai/+merge/219750
Your team Widelands Developers is requested to review the proposed merge of lp:~tiborb95/widelands/tiborb-ai into lp:widelands.

References

Re: [Merge] lp:~tiborb95/widelands/tiborb-ai into lp:widelands
From: SirVer, 2014-05-16