[Commits] [wesnoth/wesnoth] f421d8: Properly correct the broken Desert Sands / Oasis h...

[GitHub]

  Branch: refs/heads/1.12
  Home:   https://github.com/wesnoth/wesnoth
  Commit: f421d837f75fa2843e9bb3f56f5eca5848471d2a
      https://github.com/wesnoth/wesnoth/commit/f421d837f75fa2843e9bb3f56f5eca5848471d2a
  Author: Wedge009 <wedge009 at wedge009.net>
  Date:   2015-10-30 (Fri, 30 Oct 2015)

  Changed paths:
    M data/core/terrain.cfg
    M src/terrain.cpp

  Log Message:
  -----------
  Properly correct the broken Desert Sands / Oasis help entry (bug #23023)

Reverts the previous change to the terrain.cfg and allows the terrain code to fall back to name if editor name is unavailable.


  Commit: 769807e085c9ff687f6b0261fab5f4909de3b701
      https://github.com/wesnoth/wesnoth/commit/769807e085c9ff687f6b0261fab5f4909de3b701
  Author: Wedge009 <wedge009 at wedge009.net>
  Date:   2015-10-30 (Fri, 30 Oct 2015)

  Changed paths:
    M src/terrain.cpp

  Log Message:
  -----------
  Ensure base editor name can fall back to base name (in addition to overlay fall back).


  Commit: a713f7e3605f2201aedd7cc2af503a04101b501a
      https://github.com/wesnoth/wesnoth/commit/a713f7e3605f2201aedd7cc2af503a04101b501a
  Author: Ignacio R. Morelle <shadowm at wesnoth.org>
  Date:   2015-10-31 (Sat, 31 Oct 2015)

  Changed paths:
    M data/core/terrain.cfg
    M src/terrain.cpp

  Log Message:
  -----------
  Merge pull request #546 from Wedge009/bug_23023_fix_(1.12)

Properly correct the broken Desert Sands / Oasis help entry (bug #23023) [1.12]


Compare: https://github.com/wesnoth/wesnoth/compare/604d9c53be23...a713f7e3605f