[Commits] [wesnoth/wesnoth] 304f48: update mainline for #1846

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 304f4808132be803da9588dfb818cd0bf9c9044c
      https://github.com/wesnoth/wesnoth/commit/304f4808132be803da9588dfb818cd0bf9c9044c
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2017-07-26 (Wed, 26 Jul 2017)

  Changed paths:
    M data/multiplayer/scenarios/2p_Clearing_Gushes.cfg
    M data/multiplayer/scenarios/2p_Cynsaun_Battlefield.cfg
    M data/multiplayer/scenarios/2p_Dark_Forecast.cfg
    M data/multiplayer/scenarios/2p_The_Walls_of_Pyrennis.cfg
    M data/multiplayer/scenarios/4p_A_New_Land.cfg
    M data/multiplayer/scenarios/5p_The_Wilderlands.cfg
    M data/multiplayer/scenarios/6p_Crusaders_Field.cfg
    M data/multiplayer/scenarios/9p_Merkwuerdigliebe.cfg

  Log Message:
  -----------
  update mainline for #1846