[Commits] [wesnoth/wesnoth] 33689f: fixup prior commit

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 33689f6c7cbf50aca8634435e411fddb78dc9fbc
      https://github.com/wesnoth/wesnoth/commit/33689f6c7cbf50aca8634435e411fddb78dc9fbc
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    M src/reports.cpp

  Log Message:
  -----------
  fixup prior commit


  Commit: 656870ca64a982b7a76d6b0fd61e343cb2781adb
      https://github.com/wesnoth/wesnoth/commit/656870ca64a982b7a76d6b0fd61e343cb2781adb
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    M src/map.cpp
    M src/map.hpp
    M src/map_location.cpp
    M src/map_location.hpp
    M src/replay.cpp
    M src/team.cpp
    M src/terrain_filter.cpp
    M src/tod_manager.cpp

  Log Message:
  -----------
  move parse_location_range to map:: object

This function required the use of resources::game_map, so properly
should be a method of game_map. This will help us to make sure that
such functions work when using either the editor or the play
controller, or the replay controller, and generally improve
encapsulation.


  Commit: c88b64be2311a33f418840172c04f01fa6a05e49
      https://github.com/wesnoth/wesnoth/commit/c88b64be2311a33f418840172c04f01fa6a05e49
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    M src/image.cpp
    M src/image.hpp
    M src/loadscreen.cpp
    M src/sdl/texture.cpp
    M src/sdl/texture.hpp
    M src/sdl/window.cpp
    M src/sdl/window.hpp

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


Compare: https://github.com/wesnoth/wesnoth/compare/4a179629c4b5...c88b64be2311