[wesnoth-commits] [wesnoth/wesnoth] ae5bbe: DW: change mermen to merfolk/mer

[nemaara]

  Branch: refs/heads/1.14
  Home:   https://github.com/wesnoth/wesnoth
  Commit: ae5bbe90765c97ad3d30e3d551b2e079f2c30a7e
      https://github.com/wesnoth/wesnoth/commit/ae5bbe90765c97ad3d30e3d551b2e079f2c30a7e
  Author: nemaara <nemaara at gmail.com>
  Date:   2019-04-16 (Tue, 16 Apr 2019)

  Changed paths:
    M data/campaigns/Dead_Water/scenarios/01_Invasion.cfg
    M data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg
    M data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg
    M data/campaigns/Dead_Water/scenarios/12_Revenge.cfg
    M data/campaigns/Dead_Water/units/Child_King.cfg

  Log Message:
  -----------
  DW: change mermen to merfolk/mer


  Commit: a4e8028fc14273195e226fb26e03e94ae9bfaa48
      https://github.com/wesnoth/wesnoth/commit/a4e8028fc14273195e226fb26e03e94ae9bfaa48
  Author: nemaara <nemaara at gmail.com>
  Date:   2019-04-16 (Tue, 16 Apr 2019)

  Changed paths:
    M data/core/images/portraits/ARTISTS
    M data/multiplayer/scenarios/Random_Scenario.cfg
    M data/multiplayer/scenarios/Random_Scenario_Desert.cfg
    M data/multiplayer/scenarios/Random_Scenario_Marsh.cfg
    M data/scenario-test.cfg

  Log Message:
  -----------
  Change various references of mermen to merfolk


  Commit: 5f2a4aa1225f191a6750080c46e3ff25275deae4
      https://github.com/wesnoth/wesnoth/commit/5f2a4aa1225f191a6750080c46e3ff25275deae4
  Author: nemaara <nemaara at gmail.com>
  Date:   2019-04-16 (Tue, 16 Apr 2019)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg
    M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
    M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg

  Log Message:
  -----------
  TSG: change references of mermen to merfolk


  Commit: a2fa0666cf7f73d66bff4efecc81bd567a3acea3
      https://github.com/wesnoth/wesnoth/commit/a2fa0666cf7f73d66bff4efecc81bd567a3acea3
  Author: nemaara <nemaara at gmail.com>
  Date:   2019-04-16 (Tue, 16 Apr 2019)

  Changed paths:
    M data/core/units/merfolk/Entangler.cfg
    M data/core/units/merfolk/Hunter.cfg
    M data/core/units/merfolk/Javelineer.cfg
    M data/core/units/merfolk/Netcaster.cfg
    M data/core/units/merfolk/Spearman.cfg
    M data/core/units/merfolk/Warrior.cfg

  Log Message:
  -----------
  Merfolk: change references of mermen to merfolk/mer


  Commit: 75f02d5b8193b74b306f430d8513a7269af6d378
      https://github.com/wesnoth/wesnoth/commit/75f02d5b8193b74b306f430d8513a7269af6d378
  Author: nemaara <nemaara at gmail.com>
  Date:   2019-04-16 (Tue, 16 Apr 2019)

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg

  Log Message:
  -----------
  HttT: change mermen to merfolk/mer


  Commit: ea8889f460c053ba16d7ea2fde9b608aadf65b3f
      https://github.com/wesnoth/wesnoth/commit/ea8889f460c053ba16d7ea2fde9b608aadf65b3f
  Author: nemaara <nemaara at gmail.com>
  Date:   2019-04-16 (Tue, 16 Apr 2019)

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/19a_Snow_Plains.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/21_Elven_Council.cfg

  Log Message:
  -----------
  HttT: remove Princess as a direct address


  Commit: e292c2292e7b43819548e84f29955d26189089ab
      https://github.com/wesnoth/wesnoth/commit/e292c2292e7b43819548e84f29955d26189089ab
  Author: nemaara <nemaara at gmail.com>
  Date:   2019-04-16 (Tue, 16 Apr 2019)

  Changed paths:
    M data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.cfg
    M data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
    M data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg

  Log Message:
  -----------
  NR: remove Princess as a direct address


  Commit: d2d4626ea4ceac622640ded55ca4d44c77a8cb9f
      https://github.com/wesnoth/wesnoth/commit/d2d4626ea4ceac622640ded55ca4d44c77a8cb9f
  Author: nemaara <nemaara at users.noreply.github.com>
  Date:   2019-04-16 (Tue, 16 Apr 2019)

  Changed paths:
    M data/campaigns/Dead_Water/scenarios/12_Revenge.cfg

  Log Message:
  -----------
  DW S12: change reference to mermen


  Commit: 9b9267f2421eb7207a7807e8124d8c83fd857dcf
      https://github.com/wesnoth/wesnoth/commit/9b9267f2421eb7207a7807e8124d8c83fd857dcf
  Author: nemaara <nemaara at users.noreply.github.com>
  Date:   2019-04-16 (Tue, 16 Apr 2019)

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg

  Log Message:
  -----------
  HttT S3: proper noun capitalization


  Commit: 2f405edbd40058e9a9ce2e66a1bcceb67619407a
      https://github.com/wesnoth/wesnoth/commit/2f405edbd40058e9a9ce2e66a1bcceb67619407a
  Author: nemaara <nemaara at gmail.com>
  Date:   2019-04-16 (Tue, 16 Apr 2019)

  Changed paths:
    M changelog.md

  Log Message:
  -----------
  Update changelog with prose fixes


  Commit: 03645aeacf675aa4379cfb2790278f1c2e409720
      https://github.com/wesnoth/wesnoth/commit/03645aeacf675aa4379cfb2790278f1c2e409720
  Author: nemaara <nemaara at gmail.com>
  Date:   2019-04-16 (Tue, 16 Apr 2019)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg

  Log Message:
  -----------
  TSG S6a: update variable name

Just in case someone somehow gets to this scenario and it breaks because I changed the variable's name


Compare: https://github.com/wesnoth/wesnoth/compare/573de19737af...03645aeacf67