[Commits] [wesnoth/wesnoth] 2319bd: Merge branch 'master' of github.com:wesnoth/wesnot...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 2319bd26ab453d9671fb0f9aaf5c5f65cae67b4c
      https://github.com/wesnoth/wesnoth/commit/2319bd26ab453d9671fb0f9aaf5c5f65cae67b4c
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2015-10-09 (Fri, 09 Oct 2015)

  Changed paths:
    M src/game_events/action_wml.cpp
    M src/scripting/game_lua_kernel.cpp
    M src/scripting/lua_common.cpp
    M src/scripting/lua_common.hpp
    M src/variable.hpp

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


  Commit: 0fe3bbd3629de65410afba59a752230801985ae6
      https://github.com/wesnoth/wesnoth/commit/0fe3bbd3629de65410afba59a752230801985ae6
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2015-10-09 (Fri, 09 Oct 2015)

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


  Commit: ae305e9cc7885294617a86562bf8705cbbc7181e
      https://github.com/wesnoth/wesnoth/commit/ae305e9cc7885294617a86562bf8705cbbc7181e
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2015-10-09 (Fri, 09 Oct 2015)

  Changed paths:
    M src/editor/map/context_manager.cpp

  Log Message:
  -----------
  Don't switch map contexts when opening the map currently being viewed


Compare: https://github.com/wesnoth/wesnoth/compare/610aa9a2da1e...ae305e9cc788