[Commits] [wesnoth/wesnoth] 2043cf: try to fix travis build

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 2043cf82c44c5ee3f69550686228495db1bf6c55
      https://github.com/wesnoth/wesnoth/commit/2043cf82c44c5ee3f69550686228495db1bf6c55
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M src/whiteboard/mapbuilder.hpp

  Log Message:
  -----------
  try to fix travis build


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

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    M src/ai/composite/goal.cpp
    M src/ai/default/ai.cpp
    M src/ai/lua/core.cpp
    M src/ai/testing/ca.cpp
    M src/ai/testing/ca_testing_recruitment.cpp
    M src/editor/map/map_context.hpp
    A src/game_classification.cpp
    A src/game_classification.hpp
    M src/game_config_manager.cpp
    M src/game_config_manager.hpp
    M src/game_events/action_wml.cpp
    M src/game_preferences.cpp
    M src/gamestatus.cpp
    M src/gamestatus.hpp
    M src/gui/dialogs/chat_log.cpp
    M src/gui/dialogs/game_load.cpp
    M src/multiplayer_connect.hpp
    M src/multiplayer_ui.cpp
    M src/multiplayer_wait.hpp
    M src/replay_controller.hpp
    M src/save_index.cpp
    M src/save_index.hpp
    M src/saved_game.cpp
    M src/saved_game.hpp
    M src/savegame.cpp
    M src/savegame.hpp
    M src/scripting/lua.cpp
    M src/synced_context.cpp
    M src/unit_abilities.cpp

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


Compare: https://github.com/wesnoth/wesnoth/compare/63c07fea3e89...f446245ff590