[wesnoth-commits] [wesnoth/wesnoth] 639196: Attempt to fixup 601c10c

[Charles Dang]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 6391969fa6e086e6e8a3efa72a79170920357609
      https://github.com/wesnoth/wesnoth/commit/6391969fa6e086e6e8a3efa72a79170920357609
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2021-01-21 (Thu, 21 Jan 2021)

  Changed paths:
    M src/editor/palette/location_palette.cpp

  Log Message:
  -----------
  Attempt to fixup 601c10c


  Commit: a8fa01117a87e900a19d89b3d732479a73b0bb44
      https://github.com/wesnoth/wesnoth/commit/a8fa01117a87e900a19d89b3d732479a73b0bb44
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2021-01-21 (Thu, 21 Jan 2021)

  Changed paths:
    M data/campaigns/Sceptre_of_Fire/utils/bigmap.cfg
    M data/campaigns/Secrets_of_the_Ancients/utils/terrain_graphics.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/units/Kalian.cfg
    M data/campaigns/World_Conquest/_main.cfg
    M data/campaigns/World_Conquest/config.cfg
    M data/campaigns/World_Conquest/era/campaign/heroes.cfg
    M data/campaigns/World_Conquest/era/era.cfg
    M data/campaigns/World_Conquest/resources/data/artifacts.cfg
    M data/campaigns/World_Conquest/resources/data/training.cfg
    M data/campaigns/World_Conquest/resources/resources.cfg
    M data/campaigns/World_Conquest/scenarios/WC_II_scenario.cfg

  Log Message:
  -----------
  Merge branch 'master' of github.com:wesnoth/wesnoth into master


Compare: https://github.com/wesnoth/wesnoth/compare/5b7865e36fdd...a8fa01117a87