widelands-dev team mailing list archive

Thread
Date

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

To: mp+281365@xxxxxxxxxxxxxxxxxx
From: TiborB <tiborb95@xxxxxxxxx>
Date: Tue, 29 Dec 2015 19:46:17 -0000
In-reply-to: <20151226194424.11409.39980.launchpad@ackee.canonical.com>
Reply-to: mp+281365@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Kaputtnik, will you push it into trunk? 
I could do it, but there are some text conflicts in:

Text conflict in tribes/workers/atlanteans/forester/init.lua
Text conflict in tribes/workers/barbarians/ranger/init.lua
Text conflict in tribes/workers/empire/fisher/init.lua
Text conflict in tribes/workers/empire/forester/init.lua
Text conflict in tribes/workers/empire/vinefarmer/init.lua

-- 
https://code.launchpad.net/~widelands-dev/widelands/missing_worker_animations/+merge/281365
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/missing_worker_animations.

References

[Merge] lp:~widelands-dev/widelands/missing_worker_animations into lp:widelands
From: kaputtnik, 2015-12-26