[Commits] [wesnoth/wesnoth] 88ed44: fixup std::min usage with strings, when saving ima...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 88ed44b374c9be6768d7cb3e2845cae518fb330d
      https://github.com/wesnoth/wesnoth/commit/88ed44b374c9be6768d7cb3e2845cae518fb330d
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M src/game_launcher.cpp

  Log Message:
  -----------
  fixup std::min usage with strings, when saving images

I think this should fix the error reported by Pentarctagon here,
at the very end of his log.

http://forums.wesnoth.org/viewtopic.php?f=4&t=41018&start=15#p577053


  Commit: 1385ab3791088d7c9bfa3bc439fcf49b23563535
      https://github.com/wesnoth/wesnoth/commit/1385ab3791088d7c9bfa3bc439fcf49b23563535
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M src/commandline_options.cpp
    M src/commandline_options.hpp
    M src/filesystem_boost.cpp
    M src/game_preferences.cpp
    M src/gui/auxiliary/event/dispatcher.hpp
    M src/gui/auxiliary/event/handler.cpp
    M src/gui/auxiliary/filter.hpp
    M src/gui/dialogs/chat_log.cpp
    M src/gui/widgets/password_box.cpp
    M src/gui/widgets/text.cpp
    M src/gui/widgets/text_box.cpp
    M src/hotkey/hotkey_item.cpp
    M src/marked-up_text.cpp
    M src/marked-up_text.hpp
    M src/race.cpp
    M src/race.hpp
    M src/scripting/lua.cpp
    A src/serialization/ucs4_convert_impl.hpp
    M src/serialization/ucs4_iterator_base.hpp
    M src/serialization/unicode.cpp
    M src/serialization/unicode.hpp
    A src/serialization/unicode_cast.hpp
    A src/serialization/unicode_types.hpp
    M src/tests/test_commandline_options.cpp
    M src/tests/test_mp_connect.cpp
    M src/text.cpp
    M src/text.hpp
    M src/util.hpp
    M src/wesnoth.cpp

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


Compare: https://github.com/wesnoth/wesnoth/compare/702341668887...1385ab379108