Merge lp:~widelands-dev/widelands/fix-frisian-trainingsites-food-help into lp:widelands

Proposed by GunChleoc
Status: Merged
Merged at revision: 8787
Proposed branch: lp:~widelands-dev/widelands/fix-frisian-trainingsites-food-help
Merge into: lp:widelands
Diff against target: 23 lines (+2/-4)
1 file modified
data/tribes/buildings/trainingsites/frisians/training_camp/init.lua (+2/-4)
To merge this branch: bzr merge lp:~widelands-dev/widelands/fix-frisian-trainingsites-food-help
Reviewer Review Type Date Requested Status
hessenfarmer Approve
Review via email: mp+352977@code.launchpad.net

Commit message

Fix food help for Frisian Training Camp.

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

Originally reported on the forum: https://wl.widelands.org/forum/topic/4312/

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

LGTM!
Thanks for fixing.

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

Continuous integration builds have changed state:

Travis build 3783. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/415471904.
Appveyor build 3582. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fix_frisian_trainingsites_food_help-3582.

Revision history for this message
GunChleoc (gunchleoc) wrote :

@bunnybot merge

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3802. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/416115952.
Appveyor build 3601. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fix_frisian_trainingsites_food_help-3601.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/tribes/buildings/trainingsites/frisians/training_camp/init.lua'
2--- data/tribes/buildings/trainingsites/frisians/training_camp/init.lua 2018-07-17 10:13:49 +0000
3+++ data/tribes/buildings/trainingsites/frisians/training_camp/init.lua 2018-08-14 20:53:48 +0000
4@@ -87,8 +87,7 @@
5 min_level = 0,
6 max_level = 0,
7 food = {
8- {"bread_frisians"},
9- {"beer"},
10+ {"bread_frisians", "beer"},
11 {"smoked_fish", "smoked_meat"},
12 },
13 weapons = {
14@@ -99,8 +98,7 @@
15 min_level = 0,
16 max_level = 0,
17 food = {
18- {"bread_frisians"},
19- {"beer"},
20+ {"bread_frisians", "beer"},
21 {"smoked_fish", "smoked_meat"},
22 },
23 weapons = {

Subscribers

People subscribed via source and target branches

to status/vote changes: