mirror of
https://github.com/wesnoth/wesnoth
synced 2025-05-14 19:39:06 +00:00

Conflicts: .travis.yml SConstruct src/campaign_server/campaign_server.cpp src/create_engine.cpp src/editor/map/map_context.cpp src/game_config_manager.cpp src/gui/dialogs/screenshot_notification.cpp src/gui/dialogs/wml_error.cpp src/savegame.cpp