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

[nemaara]

  Branch: refs/heads/1.14
  Home:   https://github.com/wesnoth/wesnoth
  Commit: a39883a715a7889dda2eb6104520233e31ea7132
      https://github.com/wesnoth/wesnoth/commit/a39883a715a7889dda2eb6104520233e31ea7132
  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/12_Revenge.cfg

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


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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg

  Log Message:
  -----------
  HttT: modify references to mer


  Commit: 1482730350794540b6e6f3b84aa362db71143eb7
      https://github.com/wesnoth/wesnoth/commit/1482730350794540b6e6f3b84aa362db71143eb7
  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/Spearman.cfg

  Log Message:
  -----------
  Merfolk: change mer to merfolk


Compare: https://github.com/wesnoth/wesnoth/compare/0d5e72c99977...148273035079