The proposal to merge lp:~widelands-dev/widelands/one_world into lp:widelands
has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/one_world/+merge/222708
--
https://code.launchpad.net/~widelands-dev/widelands/one_world/
Thanks for taking care of this and for the review in general. I'll go ahead and
merge then. I also merge the translations as Gun proposed and as we already
tested basically works.
--
https://code.launchpad.net/~widelands-dev/widelands/one_world/+merge/222708
Your team Widelands Developers is sub
One last thing: The diff against target in this merge request says 'Text
conflict in src/graphic/animation.cc'. So won't be a clean merge.
--
https://code.launchpad.net/~widelands-dev/widelands/one_world/+merge/222708
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widel
Review: Approve
I just took the time to understand and simplify the
ResourceDescription::get_editor_pic method. The old behavior to fallback to a
resource pic with a negative upper limit was removed since it was not used
anyway. If you really don't want it in this commit you are free to revert
I have made an announcement on the forum and am grabbing a translation archive
today.
Sorry I'm a bit slow reacting to stuff, I'm travelling at the moment ;)
--
https://code.launchpad.net/~widelands-dev/widelands/one_world/+merge/222708
Your team Widelands Developers is subscribed to branch
lp:
5 matches
Mail list logo
