Merge lp:~widelands-dev/widelands/bug-1662479 into lp:widelands

[TiborB]

Trivial fix - attribute of prefilled buiding barracks was not updated due to the latest changes in lua

[GunChleoc (gunchleoc)]

LGTM :)

@bunnybot merge

review: Approve

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1916. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/200146131.
Appveyor build 1751. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1662479-1751.

=== modified file 'data/campaigns/tutorial02_warfare.wmf/scripting/starting_conditions.lua'
--- data/campaigns/tutorial02_warfare.wmf/scripting/starting_conditions.lua	2017-01-05 20:43:56 +0000
+++ data/campaigns/tutorial02_warfare.wmf/scripting/starting_conditions.lua	2017-02-09 20:41:48 +0000
@@ -54,7 +54,7 @@
       {"barbarians_sentry", 28, 57, soldiers = {[{3,5,0,2}] = 2 }},
       {"barbarians_sentry", 37, 61, soldiers = {[{3,5,0,2}] = 2 }},
       {"barbarians_barrier", 30, 58, soldiers = {[{0,0,0,0}] = 1 }}, -- to make sure some soldiers walk out
-      {"barbarians_barracks", 32, 58, wares = {ax = 8}},
+      {"barbarians_barracks", 32, 58, inputs = {ax = 8}},
       {"barbarians_lumberjacks_hut", 24, 1}
    )