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

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 63788d5f4adaf0d7587a88daf6e7ee54fb16459d
      https://github.com/wesnoth/wesnoth/commit/63788d5f4adaf0d7587a88daf6e7ee54fb16459d
  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: ab89d26eb264e92e9632f28f5f3e7a9165fa86ee
      https://github.com/wesnoth/wesnoth/commit/ab89d26eb264e92e9632f28f5f3e7a9165fa86ee
  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: a7a86fc388f4f14f1151de62eeb5559363f11b68
      https://github.com/wesnoth/wesnoth/commit/a7a86fc388f4f14f1151de62eeb5559363f11b68
  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 #545 from Wedge009/bug_23023_fix

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


Compare: https://github.com/wesnoth/wesnoth/compare/ba8da9213511...a7a86fc388f4