[Commits] [wesnoth/wesnoth] d6dfec: fixup error loggins, catch parsing exceptions in e...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: d6dfec6151fb6eb5dd2d9f2d96920f1a9d7ec1ca
      https://github.com/wesnoth/wesnoth/commit/d6dfec6151fb6eb5dd2d9f2d96920f1a9d7ec1ca
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-05-22 (Thu, 22 May 2014)

  Changed paths:
    M src/addon/manager.cpp
    M src/config_cache.cpp
    M src/editor/map/map_context.cpp
    M src/game.cpp
    M src/persist_context.cpp
    M src/savegame.cpp

  Log Message:
  -----------
  fixup error loggins, catch parsing exceptions in editor, -p option


  Commit: ca5ea804e905cc89e95d2818e092323eb3c4a7b6
      https://github.com/wesnoth/wesnoth/commit/ca5ea804e905cc89e95d2818e092323eb3c4a7b6
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-05-22 (Thu, 22 May 2014)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
    M players_changelog
    M projectfiles/CodeBlocks/wesnoth.cbp

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


Compare: https://github.com/wesnoth/wesnoth/compare/86fe11bb2488...ca5ea804e905