[wesnoth-commits] [wesnoth/wesnoth] 94dd28: DW: Change the team name from Merman Forces to Mer...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 94dd2880c6f71e16bee607ebb7b3fbd2c2e5b410
      https://github.com/wesnoth/wesnoth/commit/94dd2880c6f71e16bee607ebb7b3fbd2c2e5b410
  Author: Steve Cotton <steve at octalot.co.uk>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M data/campaigns/Dead_Water/utils/dw-utils.cfg

  Log Message:
  -----------
  DW: Change the team name from Merman Forces to Merfolk


  Commit: d5f6c1723910ba32326aff466c1fb710f6afa803
      https://github.com/wesnoth/wesnoth/commit/d5f6c1723910ba32326aff466c1fb710f6afa803
  Author: Steve Cotton <steve at octalot.co.uk>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M data/campaigns/Dead_Water/scenarios/07_Bilheld.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/scenarios/13_Epilogue.cfg
    M data/campaigns/Dead_Water/units/Citizen.cfg

  Log Message:
  -----------
  Dead Water: Change "mermen" to "merfolk" (part of #2940)

This commit excludes changes to S05 Tirigaz, I think changing the dialogue
there is going to be more complicated, and it's better for that to have a
separate PR.


  Commit: ad7bc19dd98990b443bd5037952ff612dce502af
      https://github.com/wesnoth/wesnoth/commit/ad7bc19dd98990b443bd5037952ff612dce502af
  Author: Steve Cotton <steve at octalot.co.uk>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M data/campaigns/Dead_Water/utils/items.cfg
    M data/core/macros/items.cfg

  Log Message:
  -----------
  Prose: the Storm Trident's description uses "merfolk" (issue #2936)

Also update Dead Water's copy of it to use race= instead of a
list of unit types (as done for the core object in 613dd431).


Compare: https://github.com/wesnoth/wesnoth/compare/da6ebc7423ea...ad7bc19dd989
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.