Viewing all changes in revision 8785.
- Committer: Toni Förster
- Date: 2018-08-14 23:55:24 UTC
- mfrom: (8778.1.8 _widelands_dev_widelands_trunk)
- Revision ID: toni.foerster@gmail.com-20180814235524-5fwhrby9ysekpl5h
merge trunk
- files modified:
- data/campaigns/bar01.wmf/scripting/mission_thread.lua *
- data/campaigns/bar01.wmf/scripting/texts.lua *
- data/campaigns/bar02.wmf/scripting/texts.lua *
- data/campaigns/campaigns.conf *
- data/campaigns/emp01.wmf/scripting/texts.lua *
- data/campaigns/emp02.wmf/scripting/texts.lua *
- data/campaigns/fri02.wmf/pics/background.jpg *
- data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua *
- data/campaigns/tutorials.conf *
- data/scripting/set.lua *
- data/tribes/images/atlanteans/frontier_00.png *
- data/tribes/images/atlanteans/frontier_00_pc.png *
- data/tribes/images/barbarians/frontier_00.png *
- data/tribes/images/barbarians/frontier_00_pc.png *
- data/tribes/images/empire/frontier_00.png *
- data/tribes/images/empire/frontier_00_pc.png *
- data/tribes/images/frisians/frontier_00.png *
- data/tribes/images/frisians/frontier_00_pc.png *
expand all
collapse all
added
removed
