[Commits] [wesnoth/wesnoth] a7f17c: Fixed wrong speaker

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: a7f17cde30d6428b9b88ea093422bea1e58abf8b
      https://github.com/wesnoth/wesnoth/commit/a7f17cde30d6428b9b88ea093422bea1e58abf8b
  Author: ln-zookeeper <lari.nieminen at iki.fi>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Changed paths:
    M data/campaigns/Two_Brothers/scenarios/04_Return_to_the_Village.cfg

  Log Message:
  -----------
  Fixed wrong speaker


  Commit: 9e4e547178e0b60b6a3655ac2c9549de526aafa5
      https://github.com/wesnoth/wesnoth/commit/9e4e547178e0b60b6a3655ac2c9549de526aafa5
  Author: ln-zookeeper <lari.nieminen at iki.fi>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Changed paths:
    M src/display.cpp
    M src/font.cpp
    M src/font.hpp
    M src/gui/widgets/window.cpp
    M src/video.cpp

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


Compare: https://github.com/wesnoth/wesnoth/compare/15a654c3db8f...9e4e547178e0