[wesnoth-commits] [wesnoth/wesnoth] 04e840: Dark Forecast: add placed units to the help

[jostephd]

  Branch: refs/heads/1.14
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 04e840b0254458e5e117e5b175542820985abf64
      https://github.com/wesnoth/wesnoth/commit/04e840b0254458e5e117e5b175542820985abf64
  Author: sevu <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2019-03-03 (Sun, 03 Mar 2019)

  Changed paths:
    M data/multiplayer/scenarios/2p_Dark_Forecast.lua

  Log Message:
  -----------
  Dark Forecast: add placed units to the help

Resolved conflict caused by 05cd1521ffb13f33a2879dc660be5a9164afdbc9 on
master.


  Commit: 5cdd51d0e2c791b9d08e9dd02cfa04caf128dc5e
      https://github.com/wesnoth/wesnoth/commit/5cdd51d0e2c791b9d08e9dd02cfa04caf128dc5e
  Author: josteph <josteph at fastmail.com>
  Date:   2019-03-03 (Sun, 03 Mar 2019)

  Changed paths:
    M changelog.md

  Log Message:
  -----------
  Update changelog


Compare: https://github.com/wesnoth/wesnoth/compare/cc1888127c08...5cdd51d0e2c7