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

[nemaara]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 150dd85140d7914a16da2536e002f8d612bed180
      https://github.com/wesnoth/wesnoth/commit/150dd85140d7914a16da2536e002f8d612bed180
  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: 7db96e2180fcda12f7c83e4f1cc8c5df35480803
      https://github.com/wesnoth/wesnoth/commit/7db96e2180fcda12f7c83e4f1cc8c5df35480803
  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: 5489bc70029d91f0e18a2ee5b602c77563c3c082
      https://github.com/wesnoth/wesnoth/commit/5489bc70029d91f0e18a2ee5b602c77563c3c082
  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/8fb4b967da14...5489bc70029d