[Commits] [wesnoth/wesnoth] 2f31e9: Fix terrain2wiki.py for terrain.cfg syntax changes...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 2f31e98054e1540b2ce5c8b4aafa18492704e564
      https://github.com/wesnoth/wesnoth/commit/2f31e98054e1540b2ce5c8b4aafa18492704e564
  Author: Thibault Févry <ThibaultFevry at gmail.com>
  Date:   2015-03-28 (Sat, 28 Mar 2015)

  Changed paths:
    M data/core/terrain.cfg
    M data/tools/terrain2wiki.py

  Log Message:
  -----------
  Fix terrain2wiki.py for terrain.cfg syntax changes and add a note about terrain2wiki in terrain.cfg


  Commit: 9382393f7494113473242df7deb1821d156674c9
      https://github.com/wesnoth/wesnoth/commit/9382393f7494113473242df7deb1821d156674c9
  Author: Thibault Févry <ThibaultFevry at gmail.com>
  Date:   2015-03-28 (Sat, 28 Mar 2015)

  Changed paths:
    M data/tools/unit_tree/update-wmlunits
    M data/tools/wmlunits
    M src/addon/manager_ui.hpp
    M src/game_data.cpp
    M src/game_data.hpp
    M src/image_modifications.cpp
    M src/play_controller.cpp
    M src/play_controller.hpp
    M src/scripting/lua_common.hpp
    M src/sdl/image.hpp
    M src/sdl/utils.hpp

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


Compare: https://github.com/wesnoth/wesnoth/compare/310f8092ad01...9382393f7494