[Commits] [wesnoth/wesnoth] be68eb: merge LoW from 1.12 into master

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: be68ebc0a70ad22dd92febff6de9f8b096bbe81e
      https://github.com/wesnoth/wesnoth/commit/be68ebc0a70ad22dd92febff6de9f8b096bbe81e
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-11-27 (Fri, 27 Nov 2015)

  Changed paths:
    M data/campaigns/Legend_of_Wesmere/lua/wml_tags.lua
    M data/campaigns/Legend_of_Wesmere/maps/02_Hostile_Mountains.map
    M data/campaigns/Legend_of_Wesmere/maps/04_The_Elvish_Treasury.map
    M data/campaigns/Legend_of_Wesmere/maps/06_Acquaintance_in_Need.map
    M data/campaigns/Legend_of_Wesmere/maps/09_Bounty_Hunters.map
    M data/campaigns/Legend_of_Wesmere/maps/10_Cliffs_of_Thoria.map
    M data/campaigns/Legend_of_Wesmere/maps/11_Battle_of_the_Book.map
    M data/campaigns/Legend_of_Wesmere/maps/14_Human_Alliance.map
    M data/campaigns/Legend_of_Wesmere/maps/16_The_Chief_Must_Die.map
    M data/campaigns/Legend_of_Wesmere/maps/23_End_of_War.map
    M data/campaigns/Legend_of_Wesmere/maps/Kalian.map
    M data/campaigns/Legend_of_Wesmere/maps/Kalian_map.cfg
    M data/campaigns/Legend_of_Wesmere/maps/Lintanir.map
    M data/campaigns/Legend_of_Wesmere/maps/North_Elves.map
    M data/campaigns/Legend_of_Wesmere/maps/Saurgrath.map
    M data/campaigns/Legend_of_Wesmere/masks/01_The_Uprooting.mask
    M data/campaigns/Legend_of_Wesmere/masks/03_Kalian_under_Attack.mask
    M data/campaigns/Legend_of_Wesmere/masks/05_The_Saurian_Treasury.mask
    M data/campaigns/Legend_of_Wesmere/masks/07_Elves_Last_Stand.mask
    M data/campaigns/Legend_of_Wesmere/masks/17_Breaking_the_Siege.mask
    M data/campaigns/Legend_of_Wesmere/masks/19_Costly_Revenge.mask
    M data/campaigns/Legend_of_Wesmere/masks/21_Elvish_Assassins.mask
    M data/campaigns/Legend_of_Wesmere/masks/22_Northern_Battle.mask
    A data/campaigns/Legend_of_Wesmere/scenarios/North_elves_utils.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/04_The_Elvish_Treasury.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
    A data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand_utils.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/08_Council_of_Hard_Choices.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/10_Cliffs_of_Thoria.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/11_Battle_of_the_Book.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/12_Revelations.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/13_News_from_the_Front.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/16_The_Chief_Must_Die.cfg
    A data/campaigns/Legend_of_Wesmere/scenarios/chapter4/16_The_Chief_Must_Die_utils.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/17_Breaking_the_Siege.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/19_Costly_Revenge.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/21_Elvish_Assassins.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/22_Northern_Battle.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/23_End_of_War.cfg
    M data/campaigns/Legend_of_Wesmere/utils/bigmap.cfg
    M data/campaigns/Legend_of_Wesmere/utils/characters.cfg
    A data/campaigns/Legend_of_Wesmere/utils/debug.cfg
    M data/campaigns/Legend_of_Wesmere/utils/low-macros.cfg
    M data/campaigns/Legend_of_Wesmere/utils/map-utils.cfg

  Log Message:
  -----------
  merge LoW from 1.12 into master

This commit manually merges all LoW commits from the 1.12 branch into
master.

This might revert some 1.13 commits which i wasn't able to merge
correctly.