widelands

Merge lp://staging/~widelands-dev/widelands/bug1823471-empire3-4-victory into lp://staging/widelands

  1. bug1823471-empire3-4-victory
  2. Merge into trunk
Proposed by hessenfarmer
Status: Merged
Merged at revision: 9062
Proposed branch: lp://staging/~widelands-dev/widelands/bug1823471-empire3-4-victory
Merge into: lp://staging/widelands
Diff against target: 45 lines (+7/-7)
3 files modified
data/campaigns/emp02.wmf/scripting/texts.lua (+1/-1)
data/campaigns/emp03.wmf/scripting/texts.lua (+3/-3)
data/campaigns/emp04.wmf/scripting/texts.lua (+3/-3)
To merge this branch: bzr merge lp://staging/~widelands-dev/widelands/bug1823471-empire3-4-victory
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+365640@code.staging.launchpad.net

Commit message

fixes bug 1823471

this is for b21

Description of the change

in the final message of empire 3 and 4 a victory section (formatted as objective) is added

To post a comment you must log in.
Revision history for this message
GunChleoc (gunchleoc) wrote :

Code LGTM. Not tested.

review: Approve
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4686. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/516959535.
Appveyor build 4472. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug1823471_empire3_4_victory-4472.

Revision history for this message
GunChleoc (gunchleoc) wrote :

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: