[Commits] [wesnoth/wesnoth] 3a8cad: fix gcc compilation

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 3a8cad8ad237a83882066d44cbb875d161ed7fb5
      https://github.com/wesnoth/wesnoth/commit/3a8cad8ad237a83882066d44cbb875d161ed7fb5
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M src/SDL_SavePNG/savepng.h

  Log Message:
  -----------
  fix gcc compilation


  Commit: 9c6ad9c9d3379c558bab7ba3a3e66dfe45aa4468
      https://github.com/wesnoth/wesnoth/commit/9c6ad9c9d3379c558bab7ba3a3e66dfe45aa4468
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    R src/configure_engine.cpp
    R src/configure_engine.hpp
    R src/connect_engine.cpp
    R src/connect_engine.hpp
    R src/create_engine.cpp
    R src/create_engine.hpp
    R src/depcheck.cpp
    R src/depcheck.hpp
    R src/flg_manager.cpp
    R src/flg_manager.hpp
    A src/game_initialization/configure_engine.cpp
    A src/game_initialization/configure_engine.hpp
    A src/game_initialization/connect_engine.cpp
    A src/game_initialization/connect_engine.hpp
    A src/game_initialization/create_engine.cpp
    A src/game_initialization/create_engine.hpp
    A src/game_initialization/depcheck.cpp
    A src/game_initialization/depcheck.hpp
    A src/game_initialization/flg_manager.cpp
    A src/game_initialization/flg_manager.hpp
    A src/game_initialization/mp_game_utils.cpp
    A src/game_initialization/mp_game_utils.hpp
    A src/game_initialization/mp_options.cpp
    A src/game_initialization/mp_options.hpp
    A src/game_initialization/multiplayer.cpp
    A src/game_initialization/multiplayer.hpp
    A src/game_initialization/multiplayer_configure.cpp
    A src/game_initialization/multiplayer_configure.hpp
    A src/game_initialization/multiplayer_connect.cpp
    A src/game_initialization/multiplayer_connect.hpp
    A src/game_initialization/multiplayer_create.cpp
    A src/game_initialization/multiplayer_create.hpp
    A src/game_initialization/multiplayer_lobby.cpp
    A src/game_initialization/multiplayer_lobby.hpp
    A src/game_initialization/multiplayer_ui.cpp
    A src/game_initialization/multiplayer_ui.hpp
    A src/game_initialization/multiplayer_wait.cpp
    A src/game_initialization/multiplayer_wait.hpp
    A src/game_initialization/playcampaign.cpp
    A src/game_initialization/playcampaign.hpp
    A src/game_initialization/singleplayer.cpp
    A src/game_initialization/singleplayer.hpp
    M src/game_launcher.cpp
    M src/gui/dialogs/campaign_selection.hpp
    M src/gui/dialogs/campaign_settings.hpp
    M src/gui/dialogs/depcheck_select_new.hpp
    M src/gui/dialogs/mp_method_selection.cpp
    R src/mp_game_utils.cpp
    R src/mp_game_utils.hpp
    R src/mp_options.cpp
    R src/mp_options.hpp
    R src/multiplayer.cpp
    R src/multiplayer.hpp
    R src/multiplayer_configure.cpp
    R src/multiplayer_configure.hpp
    R src/multiplayer_connect.cpp
    R src/multiplayer_connect.hpp
    R src/multiplayer_create.cpp
    R src/multiplayer_create.hpp
    R src/multiplayer_lobby.cpp
    R src/multiplayer_lobby.hpp
    R src/multiplayer_ui.cpp
    R src/multiplayer_ui.hpp
    R src/multiplayer_wait.cpp
    R src/multiplayer_wait.hpp
    R src/playcampaign.cpp
    R src/playcampaign.hpp
    M src/savegame.cpp
    R src/singleplayer.cpp
    R src/singleplayer.hpp
    M src/tests/gui/test_gui2.cpp
    M src/tests/test_mp_connect.cpp
    M src/tests/utils/game_config_manager.cpp
    M src/tests/utils/play_scenario.cpp

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


Compare: https://github.com/wesnoth/wesnoth/compare/b0e6b23a9180...9c6ad9c9d337