Review: Approve
They still show up because your last commit deleted and added them instead of
modifying them - I have no idea how that could have gotten messed up in the
same commit, since the file names haven't changed.
I have hacked the branch to fix the issue.
@bunnybot merge
--
https://co
Review: Approve
Thanks, I had missed that one.
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/frisians_string_fixes/+merge/342702
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/frisians_string_fixes.
__
The proposal to merge
lp:~widelands-dev/widelands/bug-1615826-constructionsite-help into lp:widelands
has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1615826-constructionsite-help/+merge/342705
--
Your team Wid
Review: Approve review, compile, testplay
All fine.
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1615826-constructionsite-help/+merge/342705
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1615826-constructionsite-help.
_
Continuous integration builds have changed state:
Travis build 3345. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/362599028.
Appveyor build 3151. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_frisians_
I had the very same idea once upon a while.
Code Review is fine, no objections herer.
will check this with some testplay.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1615826-constructionsite-help/+merge/342705
Your team Widelands Developers is requested to review the proposed merg
Continuous integration builds have changed state:
Travis build 3344. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/362501908.
Appveyor build 3150. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_161582
Looks good to me, one diff comment
Diff comments:
> === modified file 'data/campaigns/fri01.wmf/scripting/texts.lua'
> --- data/campaigns/fri01.wmf/scripting/texts.lua 2018-03-11 15:55:43
> +
> +++ data/campaigns/fri01.wmf/scripting/texts.lua 2018-04-05 06:03:52
> +
> @@ -312,
I implemented your diff comments.
data/i18n/locales.lua, data/txts/developers.lua and
data/txts/translators_data.lua are now identical to trunk, I don´t understand
why they are still shown in the diff?
--
https://code.launchpad.net/~widelands-dev/widelands/frisians-tweak/+merge/342599
Your team
Refusing to merge, since Travis is not green. Use @bunnybot merge force for
merging anyways.
Travis build 3339. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/361802857.
--
https://code.launchpad.net/~widelands-dev/widelands/ai_mineable_buildable/+merge/342601
Your te
Review: Approve
Code looks good too.
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/ai_mineable_buildable/+merge/342601
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/ai_mineable_buildable.
Continuous integration builds have changed state:
Travis build 3343. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/362480961.
Appveyor build 3149. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_frisians_s
GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1615826-constructionsite-help into lp:widelands.
Commit message:
Constructionsites' help button now points to the help for the building being
built.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1615
13 matches
Mail list logo
