[Commits] [wesnoth/wesnoth] 2459e7: This reworks the hotkey system to rely on keycodes...

GitHub noreply at github.com
Sat Dec 19 00:55:05 UTC 2015


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 2459e7db10a5f5437e30279ab6952bd9ad9a9123
      https://github.com/wesnoth/wesnoth/commit/2459e7db10a5f5437e30279ab6952bd9ad9a9123
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M data/core/hotkeys.cfg
    M src/CMakeLists.txt
    M src/SConscript
    M src/controller_base.cpp
    M src/gui/auxiliary/event/handler.cpp
    M src/hotkey/command_executor.cpp
    M src/hotkey/command_executor.hpp
    M src/hotkey/hotkey_command.cpp
    M src/hotkey/hotkey_item.cpp
    M src/hotkey/hotkey_item.hpp
    M src/hotkey/hotkey_preferences_display.cpp
    A src/sdl/keyboard.cpp
    A src/sdl/keyboard.hpp
    M src/sdl/utils.cpp

  Log Message:
  -----------
  This reworks the hotkey system to rely on keycodes.

There is a new class introduced, hokey_base, that is the public
interface to the hotkey bindings. It is an abstract class that relies
on concrete classes hokey_keyboard and hotkey_mouse to do the device
specific hotkey work via the template method pattern.

There are two factory methods introduced, load_hotkey and
create_hotkey that should only be used to instantiate new objects.

This commit also changes the hotkey ":" and "+" to ";" respective "="
becausse ":" and "+" are not valid keycodes.


  Commit: 56eb59df5edeedb824e9e9ccfed36370ab7b62f2
      https://github.com/wesnoth/wesnoth/commit/56eb59df5edeedb824e9e9ccfed36370ab7b62f2
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M data/core/hotkeys.cfg
    M src/hotkey/hotkey_item.cpp
    M src/hotkey/hotkey_item.hpp
    M src/sdl/keyboard.cpp
    M src/sdl/keyboard.hpp

  Log Message:
  -----------
  Replace keycode with scancode and fix broken keybindings.

Broken keybindings are fixed byreplacing " " with "space".

Scancodes are tied to physical buttons on the keyboard and are
language independant.


  Commit: 05c1d8a5a97c208a57960afb3e711d6300f9b933
      https://github.com/wesnoth/wesnoth/commit/05c1d8a5a97c208a57960afb3e711d6300f9b933
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M src/hotkey/hotkey_item.cpp

  Log Message:
  -----------
  Incorporate review feedback from Spindel.


  Commit: e4ddf68c64a93f576ee7483ff2247ec783872f00
      https://github.com/wesnoth/wesnoth/commit/e4ddf68c64a93f576ee7483ff2247ec783872f00
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M src/hotkey/hotkey_item.cpp

  Log Message:
  -----------
  Fix potential null pointer being returned from "create hotkey"


  Commit: a7cb3f871da44c483f3ce14e10dc25f8cf29cb8c
      https://github.com/wesnoth/wesnoth/commit/a7cb3f871da44c483f3ce14e10dc25f8cf29cb8c
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M src/hotkey/hotkey_item.cpp
    M src/hotkey/hotkey_item.hpp
    M src/hotkey/hotkey_preferences_display.cpp

  Log Message:
  -----------
  Fix mods in hotkey creation and scope matching in bindings_equal.

I had inadvertedly dropped the keyboard mods in the hotkey creation
factory method, leading to a shortcut like ctrl+t being registered as
simply t.  bindings_equal checked if scopes were exactly equal instead
of overlap, it now checks for overlap instead of equality. A
fundamental limitation of the way hotkeys are handled (both old and
new) is that you cannot have scope specific hotkeys.

This also fixes formatting.


  Commit: 7943cf034c2a42620a0dabfe8cbb56b36569af02
      https://github.com/wesnoth/wesnoth/commit/7943cf034c2a42620a0dabfe8cbb56b36569af02
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M src/hotkey/hotkey_item.cpp

  Log Message:
  -----------
  Incorporate new review feedback from Spindel.


  Commit: cc28414c4be62542d1ed411ee7682a7596ecec79
      https://github.com/wesnoth/wesnoth/commit/cc28414c4be62542d1ed411ee7682a7596ecec79
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-06 (Sun, 06 Sep 2015)

  Changed paths:
    M src/hotkey/hotkey_item.cpp
    M src/hotkey/hotkey_item.hpp
    M src/sdl/keyboard.cpp
    M src/sdl/keyboard.hpp

  Log Message:
  -----------
  Fix presentation bug of keyboard hotkeys and incorporate review feedback.


  Commit: 91cd168ec82de530244170568d99e46ac940ac30
      https://github.com/wesnoth/wesnoth/commit/91cd168ec82de530244170568d99e46ac940ac30
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-06 (Sun, 06 Sep 2015)

  Changed paths:
    M data/core/hotkeys.cfg
    M src/CMakeLists.txt
    M src/SConscript
    M src/controller_base.cpp
    M src/gui/auxiliary/event/handler.cpp
    M src/hotkey/command_executor.cpp
    M src/hotkey/command_executor.hpp
    M src/hotkey/hotkey_command.cpp
    M src/hotkey/hotkey_item.cpp
    M src/hotkey/hotkey_item.hpp
    M src/hotkey/hotkey_preferences_display.cpp
    A src/sdl/keyboard.cpp
    A src/sdl/keyboard.hpp
    M src/sdl/utils.cpp

  Log Message:
  -----------
  Merge pull request #466 from aginor/hotkeyrewrite

 This reworks the hotkey system to rely on scancodes.


  Commit: a4b957c347db782b94b14d6a3e33dbc6d6b83930
      https://github.com/wesnoth/wesnoth/commit/a4b957c347db782b94b14d6a3e33dbc6d6b83930
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M data/ai/micro_ais/cas/ca_fast_attack_utils.lua
    M data/ai/micro_ais/cas/ca_fast_combat.lua
    M data/ai/micro_ais/cas/ca_fast_move.lua
    M data/ai/micro_ais/micro_ai_wml_tag.lua
    M src/game_initialization/configure_engine.cpp
    M src/game_initialization/mp_game_utils.cpp
    M src/terrain_builder.cpp
    M src/unit_types.cpp

  Log Message:
  -----------
  Merge branch 'master' into sdl2


  Commit: c35387982cfa5428e1abfa5848f07d50cce032ce
      https://github.com/wesnoth/wesnoth/commit/c35387982cfa5428e1abfa5848f07d50cce032ce
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M data/core/hotkeys.cfg
    M data/themes/editor.cfg
    M src/editor/controller/editor_controller.cpp
    M src/gui/dialogs/title_screen.cpp
    M src/hotkey/command_executor.cpp
    M src/hotkey/hotkey_command.cpp
    M src/hotkey/hotkey_command.hpp
    M src/hotkey_handler.cpp

  Log Message:
  -----------
  Generalize Quit to Desktop hotkey so it works in-game and at titlescreen


  Commit: 59f6b7e720b746cfb53d0870514482cfff3590b3
      https://github.com/wesnoth/wesnoth/commit/59f6b7e720b746cfb53d0870514482cfff3590b3
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M src/controller_base.cpp
    M src/hotkey/command_executor.cpp
    M src/hotkey/hotkey_command.cpp

  Log Message:
  -----------
  Move special-case handling of Escape key used to quit game

It's now handled in the controller base rather than the hotkey executor.
This means that the Escape key works to close the map editor.

This means that the Escape key can also be used to exit the editor. It also means the Escape key is rebindable.


  Commit: c85c05765247ba59afdd05101692c3d619fceb23
      https://github.com/wesnoth/wesnoth/commit/c85c05765247ba59afdd05101692c3d619fceb23
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M src/controller_base.hpp

  Log Message:
  -----------
  Fix a doxy-comment erroneously claiming a function is non-virtual


  Commit: 05bbd701db2834afed3a9a046f4ec1be328ff7e4
      https://github.com/wesnoth/wesnoth/commit/05bbd701db2834afed3a9a046f4ec1be328ff7e4
  Author: Wedge009 <wedge009 at wedge009.net>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M src/attack_prediction_display.cpp

  Log Message:
  -----------
  Correct transparent damage graphs in SDL2

Alpha channel was set to 0, which means that these graphs are not displayed under SDL2. Changed alpha values to 255 to restore the graphs.

SDL1.2 builds are unaffected because they (at least going by the struct definition) ignore the value fourth colour channel.

Other changes are just white-space formatting.


  Commit: 24a54e1108c70cc493a660acdc74d65054e6dd9e
      https://github.com/wesnoth/wesnoth/commit/24a54e1108c70cc493a660acdc74d65054e6dd9e
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M data/core/hotkeys.cfg
    M src/hotkey/hotkey_item.cpp

  Log Message:
  -----------
  Show the non-rebindable shortcuts in preferences.

They can't be changed, but it will at least let people know that the key works for that command.
Currently they're just hard-coded. A more general solution would be possible, if there's
any chance that more non-rebindable hotkeys are needed.

This also removes Cmd+Shift+Q as a shortcut for Quit to Desktop on OSX.


  Commit: 40ea98568a977670e9c48ce4721ffc3d54c0b2cd
      https://github.com/wesnoth/wesnoth/commit/40ea98568a977670e9c48ce4721ffc3d54c0b2cd
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M data/themes/classic.cfg
    M data/themes/default.cfg
    M data/themes/unit_box.cfg
    M data/themes/widescreen.cfg

  Log Message:
  -----------
  Add "Quit to Desktop" to the themes.

It's still omitted from Pandora theme. Should it be?


  Commit: fedf2478d3e3225ac1018df9f5c6bd7ad03b85b2
      https://github.com/wesnoth/wesnoth/commit/fedf2478d3e3225ac1018df9f5c6bd7ad03b85b2
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M changelog
    M data/ai/micro_ais/cas/ca_fast_attack_utils.lua
    M data/ai/micro_ais/cas/ca_fast_combat.lua
    A data/ai/micro_ais/cas/ca_fast_combat_leader.lua
    M data/ai/micro_ais/micro_ai_wml_tag.lua
    M data/campaigns/Dead_Water/units/Kraken.cfg
    M data/campaigns/Delfadors_Memoirs/units/Wose_Shaman.cfg
    M data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Annalist.cfg
    M data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Loremaster.cfg
    M data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Witness.cfg
    M data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Druid.cfg
    M data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Hunter.cfg
    M data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Prowler.cfg
    M data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Sentinel.cfg
    M data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Shaman.cfg
    M data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Shyde.cfg
    M data/campaigns/Under_the_Burning_Suns/units/elves/Kaleh.cfg
    M data/campaigns/Under_the_Burning_Suns/units/elves/Nym.cfg
    M data/campaigns/Under_the_Burning_Suns/units/orcs/Dark_Assassin1.cfg
    M data/core/units/elves/Druid.cfg
    M data/core/units/elves/Enchantress.cfg
    M data/core/units/elves/Shaman.cfg
    M data/core/units/elves/Shyde.cfg
    M data/core/units/elves/Sorceress.cfg
    M data/core/units/elves/Sylph.cfg
    M data/core/units/goblins/Direwolf_Rider.cfg
    M data/core/units/goblins/Pillager.cfg
    M data/core/units/humans/Outlaw_Assassin.cfg
    M data/core/units/khalifate/Ghazi.cfg
    M data/core/units/khalifate/Khalid.cfg
    M data/core/units/khalifate/Shuja.cfg
    M data/core/units/merfolk/Entangler.cfg
    M data/core/units/merfolk/Netcaster.cfg
    M data/core/units/monsters/Cuttle_Fish.cfg
    M data/core/units/monsters/Giant_Scorpion.cfg
    M data/core/units/monsters/Giant_Spider.cfg
    M data/core/units/monsters/Water_Serpent.cfg
    M data/core/units/orcs/Assassin.cfg
    M data/core/units/orcs/Nightblade.cfg
    M data/core/units/orcs/Slayer.cfg
    M data/core/units/undead/Corpse_Ghast.cfg
    M data/core/units/undead/Corpse_Ghoul.cfg
    M data/core/units/undead/Corpse_Necrophage.cfg
    M data/game_config.cfg
    M data/scenario-test.cfg
    M data/tools/GUI.pyw
    M data/tools/wmllint-1.4
    M src/actions/attack.cpp
    M src/game_config.cpp
    M src/game_config.hpp
    M src/quit_confirmation.cpp
    M src/quit_confirmation.hpp
    M src/unit_animation.cpp
    M src/unit_display.cpp
    M src/unit_display.hpp

  Log Message:
  -----------
  Merge branch 'master' into sdl2


  Commit: 530ff130be33d91ba67e1e9c22aa6e571a1d00bd
      https://github.com/wesnoth/wesnoth/commit/530ff130be33d91ba67e1e9c22aa6e571a1d00bd
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M src/attack_prediction_display.cpp

  Log Message:
  -----------
  Merge pull request #485 from wedge009/SDL2_damage_graphs


  Commit: 763db0efe94569e3c4f9a80be31a5b96737cb84a
      https://github.com/wesnoth/wesnoth/commit/763db0efe94569e3c4f9a80be31a5b96737cb84a
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M RELEASE_NOTES
    M changelog
    M data/tools/unit_tree/update-wmlunits
    M data/tools/wmlunits
    M players_changelog
    M src/game_state.cpp

  Log Message:
  -----------
  Merge branch 'master' into sdl2


  Commit: 7c4523d4d4099274917db98264f1a6305a9303a9
      https://github.com/wesnoth/wesnoth/commit/7c4523d4d4099274917db98264f1a6305a9303a9
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M src/wesnoth.cpp

  Log Message:
  -----------
  Never show confirmation on SIGTERM


  Commit: d8a85e314443c398e04b9f9015412545acae8035
      https://github.com/wesnoth/wesnoth/commit/d8a85e314443c398e04b9f9015412545acae8035
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M src/events.cpp
    M src/hotkey/hotkey_item.cpp

  Log Message:
  -----------
  Give Alt+F4 similar special treatment to Cmd+Q


  Commit: befb1a8acedb2e35ba58737eb88af8d2dc9bdbad
      https://github.com/wesnoth/wesnoth/commit/befb1a8acedb2e35ba58737eb88af8d2dc9bdbad
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M src/wesnoth.cpp

  Log Message:
  -----------
  Let's explicitly include that just to be safe


  Commit: 8c39e05f891c5eb5bafbdf9563477562d937717b
      https://github.com/wesnoth/wesnoth/commit/8c39e05f891c5eb5bafbdf9563477562d937717b
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M src/wesnoth.cpp

  Log Message:
  -----------
  Terminate immediately on SIGINT too


  Commit: 9ffec1e33eed03f2d0d0984e0a4d07a468474a9e
      https://github.com/wesnoth/wesnoth/commit/9ffec1e33eed03f2d0d0984e0a4d07a468474a9e
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj

  Log Message:
  -----------
  Update XCode project to build against SDL2 instead of SDL1.2


  Commit: 9204d0af455986cffd485697ac860e3e2ee64dc6
      https://github.com/wesnoth/wesnoth/commit/9204d0af455986cffd485697ac860e3e2ee64dc6
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M projectfiles/Xcode/Mac Sources/SDLMain.m
    M src/wesnoth.cpp

  Log Message:
  -----------
  Remove SDL_main from OSX entry point under SDL2

SDL_main is not used any longer in SDL2. These changes instead call
direcly into the wesnoth main function after setting up the OSX
environment.


  Commit: b0ecf09ee946ea64dda13ed6ccead5a447eae04a
      https://github.com/wesnoth/wesnoth/commit/b0ecf09ee946ea64dda13ed6ccead5a447eae04a
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M projectfiles/Xcode/Mac Sources/SDLMain.m
    M projectfiles/Xcode/Mac Sources/server_main.m
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
    M src/events.cpp
    M src/events.hpp
    M src/server/server.cpp
    M src/wesnoth.cpp

  Log Message:
  -----------
  Finish changes for XCode SDL2 compilation to work


  Commit: 0bb02fb548690f2fa086a0831bda460eca0f57b1
      https://github.com/wesnoth/wesnoth/commit/0bb02fb548690f2fa086a0831bda460eca0f57b1
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-11 (Fri, 11 Sep 2015)

  Changed paths:
    M RELEASE_NOTES
    M changelog
    M data/ai/micro_ais/cas/ca_fast_combat_leader.lua
    M data/ai/micro_ais/micro_ai_wml_tag.lua
    M data/campaigns/tutorial/maps/01_Tutorial_part_1.map
    M data/core/terrain-graphics.cfg
    M data/tools/GUI.pyw
    M data/tools/unit_tree/animations.py
    M data/tools/unit_tree/helpers.py
    M data/tools/unit_tree/html_output.py
    M data/tools/unit_tree/overview.py
    M data/tools/unit_tree/update-wmlunits
    M data/tools/unit_tree/wiki_output.py
    M data/tools/wesnoth/wmlparser2.py
    A data/tools/wesnoth/wmlparser3.py
    M data/tools/wmlunits
    M projectfiles/CodeBlocks/wesnoth.cbp
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
    M src/CMakeLists.txt
    M src/SConscript
    M src/actions/create.cpp
    M src/actions/create.hpp
    M src/actions/undo.cpp
    A src/actions/unit_creator.cpp
    A src/actions/unit_creator.hpp
    M src/carryover.cpp
    M src/carryover.hpp
    M src/config.cpp
    M src/config.hpp
    M src/controller_base.hpp
    M src/display.cpp
    M src/display.hpp
    M src/game_board.cpp
    M src/game_board.hpp
    M src/game_display.cpp
    M src/game_display.hpp
    M src/game_events/wmi_container.cpp
    M src/game_initialization/multiplayer.cpp
    M src/game_initialization/playcampaign.cpp
    M src/game_state.cpp
    M src/game_state.hpp
    M src/hotkey_handler.cpp
    M src/hotkey_handler.hpp
    M src/hotkey_handler_replay.cpp
    M src/hotkey_handler_sp.cpp
    M src/hotkey_handler_sp.hpp
    A src/mp_replay_controller.cpp
    A src/mp_replay_controller.hpp
    M src/pathfind/pathfind.cpp
    M src/pathfind/pathfind.hpp
    M src/play_controller.cpp
    M src/play_controller.hpp
    M src/playmp_controller.cpp
    M src/playmp_controller.hpp
    M src/playsingle_controller.cpp
    M src/playsingle_controller.hpp
    M src/playturn.cpp
    M src/replay.cpp
    M src/replay_controller.cpp
    M src/replay_controller.hpp
    M src/reports.cpp
    M src/reports.hpp
    M src/scripting/game_lua_kernel.cpp
    M src/scripting/game_lua_kernel.hpp
    M src/synced_context.cpp
    M src/teambuilder.cpp
    M src/teambuilder.hpp
    M src/tests/test_recall_list.cpp
    M src/tests/test_unit_map.cpp
    M src/tod_manager.cpp
    M src/tod_manager.hpp
    M src/unit.cpp
    M src/unit.hpp
    M src/unit_id.cpp
    M src/unit_id.hpp
    M src/unit_map.cpp
    M src/whiteboard/highlighter.cpp
    M src/whiteboard/highlighter.hpp
    M src/whiteboard/manager.cpp

  Log Message:
  -----------
  Merge branch 'master' into sdl2


  Commit: 22cff55dc8751e97bbd0044b52b2e62412716c91
      https://github.com/wesnoth/wesnoth/commit/22cff55dc8751e97bbd0044b52b2e62412716c91
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-11 (Fri, 11 Sep 2015)

  Changed paths:
    M data/core/hotkeys.cfg
    M data/themes/classic.cfg
    M data/themes/default.cfg
    M data/themes/editor.cfg
    M data/themes/unit_box.cfg
    M data/themes/widescreen.cfg
    M projectfiles/Xcode/Mac Sources/SDLMain.m
    M projectfiles/Xcode/Mac Sources/server_main.m
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
    M src/controller_base.cpp
    M src/controller_base.hpp
    M src/editor/controller/editor_controller.cpp
    M src/events.cpp
    M src/events.hpp
    M src/gui/dialogs/title_screen.cpp
    M src/hotkey/command_executor.cpp
    M src/hotkey/hotkey_command.cpp
    M src/hotkey/hotkey_command.hpp
    M src/hotkey/hotkey_item.cpp
    M src/hotkey_handler.cpp
    M src/server/server.cpp
    M src/wesnoth.cpp

  Log Message:
  -----------
  Merge pull request #475 into sdl2 from CelticMinstrel:quit-confirm2


  Commit: 60eef087e9439b0aac9ad2ee7ce3f12d566c7fa8
      https://github.com/wesnoth/wesnoth/commit/60eef087e9439b0aac9ad2ee7ce3f12d566c7fa8
  Author: Wedge009 <wedge009 at wedge009.net>
  Date:   2015-09-12 (Sat, 12 Sep 2015)

  Changed paths:
    M src/sdl/alpha.cpp

  Log Message:
  -----------
  Correct Surface Alpha Blending in SDL2

alpha.cpp was apparently written as a compatibility wrapper for SDL2, as SDL_SetAlpha() has been replaced with other functions in SDL2. As it currently stands, it neglects to set the alpha blend mode which is now required when in SDL2.

A quick check of the code indicates that in most places where SDL_SetAlpha() is called, the alpha parameter is only set as SDL_ALPHA_OPAQUE, or the flag input parameter does not include SDL_SRCALPHA. So in either case there is no alpha blending anyway and so this omission didn't make a difference anyway.

However, alpha blending *is* used in fill_rect_alpha of rect.cpp. This is most noticeable in dialogues with sorted lists, such as the hot-key bindings in the preferences, where the background colour of the headings turns opaque white instead of the alpha-blended grey that it is in an SDL1.2 build. There is at least one graphical blending issue resolved with this change as well - it's possible others may be included with this.


  Commit: 13dd8d40fb371e25625f1af8cbd523c59452074a
      https://github.com/wesnoth/wesnoth/commit/13dd8d40fb371e25625f1af8cbd523c59452074a
  Author: Andreas <andreas at alternating.net>
  Date:   2015-09-13 (Sun, 13 Sep 2015)

  Changed paths:
    M src/sdl/alpha.cpp

  Log Message:
  -----------
  Merge pull request #489 from Wedge009/SDL2_surface_blending_correction

Correct Surface Alpha Blending in SDL2


  Commit: 8a86b547cee3ff9d08754fe2577d4e3dd40ae686
      https://github.com/wesnoth/wesnoth/commit/8a86b547cee3ff9d08754fe2577d4e3dd40ae686
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    M CMakeLists.txt
    M data/campaigns/Northern_Rebirth/maps/07a_Settling_Disputes.map
    M data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg
    M data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
    A data/core/images/portraits/monsters/transparent/yeti.png
    R data/core/images/portraits/woses/ancient-wose.png
    M data/core/images/portraits/woses/transparent/ancient-wose.png
    A data/core/images/portraits/woses/transparent/wose.png
    A data/core/images/portraits/woses/wose.png
    M data/core/units/monsters/Yeti.cfg
    M data/core/units/wose/Ancient.cfg
    M data/core/units/wose/Elder.cfg
    M data/core/units/wose/Wose.cfg
    M data/lua/wml-tags.lua
    M data/tools/GUI.pyw
    M data/tools/wmllint-1.4
    M src/actions/undo_action.cpp
    M src/actions/undo_action.hpp
    M src/actions/undo_dismiss_action.cpp
    M src/actions/undo_move_action.cpp
    M src/actions/undo_recall_action.cpp
    M src/actions/undo_recruit_action.cpp
    M src/editor/map/context_manager.cpp
    M src/game_events/action_wml.cpp
    M src/game_state.cpp
    M src/game_state.hpp
    M src/help/help.cpp
    M src/play_controller.cpp
    M src/play_controller.hpp
    M src/playmp_controller.cpp
    M src/playsingle_controller.cpp
    M src/replay.cpp
    M src/replay.hpp
    M src/scripting/game_lua_kernel.cpp
    M src/synced_context.cpp
    M src/synced_context.hpp
    M src/unit.cpp

  Log Message:
  -----------
  Merge branch 'master' into sdl2


  Commit: e8c3e99dadf6ade3b57819bc0c65b7ef4c03a076
      https://github.com/wesnoth/wesnoth/commit/e8c3e99dadf6ade3b57819bc0c65b7ef4c03a076
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    M CMakeLists.txt
    M SConstruct

  Log Message:
  -----------
  Make SDL2 the default in cmake and scons

This changes the default settings in the cmake and scons to make all
targets be compiled with SDL2 as opposed to SDL1.


  Commit: d894c8e5e60015a88e8dfc767527b33cf25867a8
      https://github.com/wesnoth/wesnoth/commit/d894c8e5e60015a88e8dfc767527b33cf25867a8
  Author: Wedge009 <wedge009 at wedge009.net>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    M src/sdl/alpha.cpp

  Log Message:
  -----------
  Correct Surface Alpha Blending in SDL2

alpha.cpp was apparently written as a compatibility wrapper for SDL2, as SDL_SetAlpha() has been replaced with other functions in SDL2. As it currently stands, it neglects to set the alpha blend mode which is now required when in SDL2.

A quick check of the code indicates that in most places where SDL_SetAlpha() is called, the alpha parameter is only set as SDL_ALPHA_OPAQUE, or the flag input parameter does not include SDL_SRCALPHA. So in either case there is no alpha blending anyway and so this omission didn't make a difference anyway.

However, alpha blending *is* used in fill_rect_alpha of rect.cpp. This is most noticeable in dialogues with sorted lists, such as the hot-key bindings in the preferences, where the background colour of the headings turns opaque white instead of the alpha-blended grey that it is in an SDL1.2 build. There is at least one graphical blending issue resolved with this change as well - it's possible others may be included with this.


  Commit: 6bde4e89e91177aa44966f7e00206d8209b4f3b3
      https://github.com/wesnoth/wesnoth/commit/6bde4e89e91177aa44966f7e00206d8209b4f3b3
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Log Message:
  -----------
  Merge branch 'sdl2' of github.com:wesnoth/wesnoth into sdl2


  Commit: a815d353707084a0a3d6fa3c1ff084245c50d763
      https://github.com/wesnoth/wesnoth/commit/a815d353707084a0a3d6fa3c1ff084245c50d763
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Add SDL2 to the travis install image


  Commit: 9ae3b29f4a2eaad56fa95c6e9f3f02e6bd39aea1
      https://github.com/wesnoth/wesnoth/commit/9ae3b29f4a2eaad56fa95c6e9f3f02e6bd39aea1
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M changelog
    M data/campaigns/Dead_Water/scenarios/02_Flight.cfg
    M data/campaigns/Dead_Water/units/Soldier_King.cfg
    M data/campaigns/Dead_Water/units/Warrior_King.cfg
    M data/campaigns/Dead_Water/units/Young_King.cfg
    M data/campaigns/Dead_Water/utils/items.cfg
    M data/campaigns/Delfadors_Memoirs/units/King_of_Wesnoth.cfg
    M data/campaigns/Delfadors_Memoirs/units/Mage_Commander.cfg
    M data/campaigns/Delfadors_Memoirs/units/Mage_Leader.cfg
    M data/campaigns/Delfadors_Memoirs/units/Mage_Magister.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg
    M data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg
    M data/campaigns/Heir_To_The_Throne/units/Commander.cfg
    M data/campaigns/Heir_To_The_Throne/units/Lord.cfg
    M data/campaigns/Heir_To_The_Throne/units/Princess.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/15_The_Treaty.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/19_Costly_Revenge.cfg
    M data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg
    M data/campaigns/Liberty/units/Death_Squire.cfg
    M data/campaigns/Liberty/units/Shadow_Lord.cfg
    M data/campaigns/Liberty/units/Shadow_Mage.cfg
    M data/campaigns/Liberty/utils/utils.cfg
    M data/campaigns/Northern_Rebirth/scenarios/04_Clearing_the_Mines.cfg
    M data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg
    M data/campaigns/Northern_Rebirth/scenarios/05a_02_Dealings.cfg
    M data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg
    M data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
    M data/campaigns/Northern_Rebirth/scenarios/08b_Ray_of_Hope.cfg
    M data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.cfg
    M data/campaigns/Northern_Rebirth/scenarios/09b_Judgment.cfg
    M data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
    M data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
    M data/campaigns/Northern_Rebirth/scenarios/14a_Epilogue.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
    M data/campaigns/Sceptre_of_Fire/units/Haldric_II.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_of_Peace.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_the_Harbor_of_Tirigaz.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_the_Smug.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/16_The_Coward.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/21_The_Plan.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Commander.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Lord.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/units/Warrior_King.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Lady.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Leader.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Outcast.cfg
    M data/campaigns/The_South_Guard/units/Horseman_Commander.cfg
    M data/campaigns/The_South_Guard/units/Infantry_Commander.cfg
    M data/campaigns/The_South_Guard/units/Infantry_Lieutenant.cfg
    M data/campaigns/The_South_Guard/units/Junior_Commander.cfg
    M data/campaigns/The_South_Guard/units/Mounted_General.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/07a_Dealing_with_Dwarves.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
    M data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Captain.cfg
    M data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Marshal.cfg
    M data/campaigns/Under_the_Burning_Suns/units/elves/Kaleh.cfg
    M data/campaigns/Under_the_Burning_Suns/units/humans/Human_Commander.cfg
    M data/core/encyclopedia/geography.cfg
    M data/core/macros/abilities.cfg
    M data/core/macros/deprecated-utils.cfg
    M data/core/units/drakes/Flameheart.cfg
    M data/core/units/drakes/Flare.cfg
    M data/core/units/elves/Captain.cfg
    M data/core/units/elves/Marshal.cfg
    M data/core/units/goblins/Rouser.cfg
    M data/core/units/humans/Loyalist_General.cfg
    M data/core/units/humans/Loyalist_Grand_Marshal.cfg
    M data/core/units/humans/Loyalist_Lieutenant.cfg
    M data/core/units/humans/Loyalist_Royal_Guard.cfg
    M data/core/units/humans/Loyalist_Sergeant.cfg
    M data/core/units/monsters/Fire_Dragon.cfg
    M data/core/units/orcs/Leader.cfg
    M data/core/units/orcs/Ruler.cfg
    M data/core/units/orcs/Sovereign.cfg
    M data/core/units/undead/Skele_Death_Knight.cfg
    A data/gui/default/window/synced_choice_wait.cfg
    M data/gui/default/window/title_screen.cfg
    M data/lua/backwards-compatibility.lua
    M data/lua/wml-tags.lua
    A data/lua/wml-utils.lua
    A data/lua/wml/message.lua
    A data/lua/wml/object.lua
    A data/test/scenarios/filter_this_unit.cfg
    M data/themes/default.cfg
    M data/tools/unit_tree/helpers.py
    M data/tools/wesnoth/wmlparser3.py
    M data/tools/wmllint
    M data/tools/wmllint-1.4
    M data/tools/wmlunits
    M doc/manual/manual.en.html
    M doc/manual/manual.en_GB.html
    M players_changelog
    M po/wesnoth-editor/hu.po
    M po/wesnoth-help/hu.po
    M po/wesnoth-lib/hu.po
    M po/wesnoth-units/hu.po
    M po/wesnoth/hu.po
    M projectfiles/CodeBlocks/wesnoth.cbp
    M projectfiles/VC9/wesnoth.vcproj
    M projectfiles/VC9/wesnothd.vcproj
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
    M run_wml_tests
    M src/CMakeLists.txt
    M src/SConscript
    M src/actions/attack.cpp
    M src/config.cpp
    M src/config.hpp
    M src/game_events/action_wml.cpp
    M src/game_events/manager.cpp
    M src/game_events/manager.hpp
    M src/game_state.cpp
    A src/gui/dialogs/synced_choice_wait.cpp
    A src/gui/dialogs/synced_choice_wait.hpp
    M src/map_location.cpp
    M src/persist_var.cpp
    M src/play_controller.cpp
    M src/play_controller.hpp
    M src/replay.cpp
    M src/replay.hpp
    M src/savegame.cpp
    M src/scripting/game_lua_kernel.cpp
    M src/scripting/game_lua_kernel.hpp
    M src/scripting/lua_gui2.cpp
    M src/scripting/lua_gui2.hpp
    M src/scripting/lua_kernel_base.cpp
    M src/scripting/lua_kernel_base.hpp
    M src/scripting/push_check.hpp
    M src/serialization/parser.cpp
    M src/serialization/ucs4_convert_impl.hpp
    M src/serialization/unicode.hpp
    M src/serialization/unicode_cast.hpp
    M src/serialization/unicode_types.hpp
    M src/server/game.cpp
    M src/synced_checkup.cpp
    M src/synced_commands.cpp
    M src/synced_context.cpp
    A src/synced_user_choice.cpp
    A src/synced_user_choice.hpp
    M src/tests/gui/test_gui2.cpp
    M src/unit.hpp
    M src/unit_abilities.cpp
    M src/unit_filter.cpp
    M src/unit_filter.hpp
    M src/variable.cpp
    M src/variable.hpp
    M src/variable_info.cpp
    M src/wesnoth.cpp
    M wml_test_schedule

  Log Message:
  -----------
  Merge with master


  Commit: 3e85559cedf506dd543558d362d31543fce1554f
      https://github.com/wesnoth/wesnoth/commit/3e85559cedf506dd543558d362d31543fce1554f
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-22 (Tue, 22 Sep 2015)

  Changed paths:
    M src/synced_user_choice.cpp
    M src/synced_user_choice.hpp

  Log Message:
  -----------
  Merge branch 'master' into sdl2


  Commit: c68fc094d7a0a4f01d00bca39eedb60b04040468
      https://github.com/wesnoth/wesnoth/commit/c68fc094d7a0a4f01d00bca39eedb60b04040468
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-23 (Wed, 23 Sep 2015)

  Changed paths:
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj

  Log Message:
  -----------
  XCode: Fix unresolved merge conflict


  Commit: f0a837227824a055362296b7db423bcdc7354c38
      https://github.com/wesnoth/wesnoth/commit/f0a837227824a055362296b7db423bcdc7354c38
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-23 (Wed, 23 Sep 2015)

  Changed paths:
    M projectfiles/Xcode/Mac Sources/SDLMain.m

  Log Message:
  -----------
  OSX: Remove SDLApplication class as SDL2 also implements it

This fixes a runtime warning about duplicate class definitions
(All the menu stuff still works.)


  Commit: eebe3cfb758ecb7e7b3867bf20bf77bbd78bdb81
      https://github.com/wesnoth/wesnoth/commit/eebe3cfb758ecb7e7b3867bf20bf77bbd78bdb81
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-23 (Wed, 23 Sep 2015)

  Changed paths:
    M projectfiles/Xcode/Mac Sources/SDLMain.m

  Log Message:
  -----------
  Revert f0a837227824a055362296b7db423bcdc7354c38 for SDL1.2 only


  Commit: a4a8936972da75e89f7b626ba503cd30e22791de
      https://github.com/wesnoth/wesnoth/commit/a4a8936972da75e89f7b626ba503cd30e22791de
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-24 (Thu, 24 Sep 2015)

  Changed paths:
    M data/advanced_preferences.cfg
    M src/cursor.cpp
    M src/cursor.hpp
    M src/display.cpp
    M src/gui/auxiliary/event/handler.cpp

  Log Message:
  -----------
  Use native colour cursors

This fixes bug #18112 and re-enables colour cursors on OSX


  Commit: 171963739be592781655464564f8007e336bc29d
      https://github.com/wesnoth/wesnoth/commit/171963739be592781655464564f8007e336bc29d
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-24 (Thu, 24 Sep 2015)

  Changed paths:
    M src/cursor.cpp
    M src/floating_label.cpp
    M src/halo.cpp
    M src/sdl/utils.cpp
    M src/sdl/utils.hpp

  Log Message:
  -----------
  Fix Alpha Blending issues in SDL2

This commit introduces a new function, sdl_copy_portion that should be
used when copying portions of the screen area for later copying back
onto the screen area. The function does a copy without alpha blending,
thus emulating the functionality that SDL1.2 provides.


  Commit: c5bd5c96b7d030567e78dc8dd4a729bc49aafd56
      https://github.com/wesnoth/wesnoth/commit/c5bd5c96b7d030567e78dc8dd4a729bc49aafd56
  Author: Andreas <andreas at alternating.net>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M src/cursor.cpp
    M src/floating_label.cpp
    M src/halo.cpp
    M src/sdl/utils.cpp
    M src/sdl/utils.hpp

  Log Message:
  -----------
  Merge pull request #500 from aginor/experimental-alpha-fix

Bugfix #23820 - Fix alpha blending under SDL2


  Commit: aa175ec0c8db84028a2bfc2506faa276a5b6d81c
      https://github.com/wesnoth/wesnoth/commit/aa175ec0c8db84028a2bfc2506faa276a5b6d81c
  Author: Andreas <andreas at alternating.net>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M data/advanced_preferences.cfg
    M src/cursor.cpp
    M src/cursor.hpp
    M src/display.cpp
    M src/gui/auxiliary/event/handler.cpp

  Log Message:
  -----------
  Merge pull request #501 from CelticMinstrel/colour-cursors

Use native colour cursors in SDL2


  Commit: 1d7e52c387889f11294aa780367d34f1698c5c36
      https://github.com/wesnoth/wesnoth/commit/1d7e52c387889f11294aa780367d34f1698c5c36
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M changelog
    M data/lua/wml-tags.lua
    M data/lua/wml-utils.lua
    M data/lua/wml/message.lua
    M data/lua/wml/object.lua
    M data/test/macros/wml_unit_test_macros.cfg
    M data/test/scenarios/break_replay_with_lua_random.cfg
    M data/test/scenarios/characterize_pathfinding.cfg
    M data/test/scenarios/conditionals.cfg
    M data/test/scenarios/facing.cfg
    M data/test/scenarios/feeding.cfg
    M data/test/scenarios/filter_vision.cfg
    M data/test/scenarios/has_ally.cfg
    A data/test/scenarios/interrupts.cfg
    M data/test/scenarios/prestart_settings.cfg
    M data/test/scenarios/recruit_facing.cfg
    M data/test/scenarios/sighted_events.cfg
    M data/test/scenarios/test_check_victory.cfg
    M data/test/scenarios/test_dofile.cfg
    M data/test/scenarios/test_end_turn.cfg
    M data/test/scenarios/test_grunt_tod_damage.cfg
    M data/test/scenarios/test_lua_wml.cfg
    M data/test/scenarios/test_menu_items.cfg
    M data/test/scenarios/test_move.cfg
    M data/test/scenarios/test_move_unit.cfg
    M data/test/scenarios/test_role_types.cfg
    M data/test/scenarios/test_unit_map.cfg
    M data/test/scenarios/test_victory_attacks.cfg
    M data/tools/GUI.pyw
    M data/tools/addon_manager/html.py
    M data/tools/wesnoth/campaignserver_client.py
    M data/tools/wesnoth/wescamp.py
    A data/tools/wesnoth/wmliterator3.py
    A data/tools/wesnoth/wmltools3.py
    M data/tools/wesnoth_addon_manager
    M data/tools/wmlindent
    M data/tools/wmllint
    M data/tools/wmllint-1.4
    M data/tools/wmlscope
    M src/formula_string_utils.hpp
    M src/synced_user_choice.cpp
    M wml_test_schedule

  Log Message:
  -----------
  Merge branch 'master' into sdl2


  Commit: 54d9965950c1cd584b1961ad028bb95151a0de63
      https://github.com/wesnoth/wesnoth/commit/54d9965950c1cd584b1961ad028bb95151a0de63
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M src/display.cpp
    M src/display.hpp

  Log Message:
  -----------
  Fix compile warning in clang

Clang is warning that the field is unused when SDL2 is enabled. This
fixes the warning by removing the field when the game is compiled with
SDL2.


  Commit: 5bd53b9eaeb353f4d1ace5dd01f0c8e2c8505bc0
      https://github.com/wesnoth/wesnoth/commit/5bd53b9eaeb353f4d1ace5dd01f0c8e2c8505bc0
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M src/video.cpp

  Log Message:
  -----------
  Fix CPP unit tests under SDL2

CPP unit tests are run without a window, causing an assert to fail in
CVideo::flip(). Changing the assert to an if-statement fixes the unit
tests.


  Commit: 85dad75cc0d68a4385eb8e62423ea8fa9c341a30
      https://github.com/wesnoth/wesnoth/commit/85dad75cc0d68a4385eb8e62423ea8fa9c341a30
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M src/video.cpp

  Log Message:
  -----------
  Fix the non_interactive() function used in WML tests

The function previously returned false, even in non-interactive
scenarios like in WML tests. This fixes the function to return the
expected values.


  Commit: f89056487e51c693cb0e51b55cac8cf27d93d804
      https://github.com/wesnoth/wesnoth/commit/f89056487e51c693cb0e51b55cac8cf27d93d804
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M src/sdl/window.cpp

  Log Message:
  -----------
  Add fullscreen support to SDL2


  Commit: 96dd2980bcfc6d03654538944331ba972ebdc55e
      https://github.com/wesnoth/wesnoth/commit/96dd2980bcfc6d03654538944331ba972ebdc55e
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M src/widgets/textbox.cpp
    M src/widgets/textbox.hpp

  Log Message:
  -----------
  Add proper text input to GUI1 textbox under SDL2

This adds proper input to the GUI1 textbox when SDL2 is used. Input is
accepted as a string, which is added to the current cursor location.


  Commit: 354673875050dbc78b72546999fb43199be998f4
      https://github.com/wesnoth/wesnoth/commit/354673875050dbc78b72546999fb43199be998f4
  Author: Wedge009 <wedge009 at wedge009.net>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M src/joystick.cpp

  Log Message:
  -----------
  Clarify implicit cast to boolean

Should not really assume that SDL_JoystickGetAttached() will return a non-zero value as 'true'. Some functions return 0 as 'success'.


  Commit: 0ba49fae04aff732847a987007bb63b4b2e04eef
      https://github.com/wesnoth/wesnoth/commit/0ba49fae04aff732847a987007bb63b4b2e04eef
  Author: Wedge009 <wedge009 at wedge009.net>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M src/attack_prediction_display.cpp
    M src/display.cpp
    M src/display_chat_manager.cpp
    M src/game_initialization/multiplayer.cpp
    M src/game_initialization/multiplayer_create.cpp
    M src/gui/widgets/window.cpp
    M src/image_modifications.cpp
    M src/marked-up_text.cpp
    M src/minimap.cpp
    M src/playmp_controller.cpp
    M src/sdl/rect.hpp
    M src/sdl/utils.cpp
    M src/sdl/utils.hpp
    M src/storyscreen/render.cpp
    M src/tests/test_image_modifications.cpp

  Log Message:
  -----------
  Replace 255 with SDL_ALPHA_OPAQUE where appropriate.

This is an extension of the previous correction to alpha values in attack_prediction_display.cpp.
For clarity and compatibility, use the SDL_ALPHA_OPAQUE definition instead of assuming hard-coded 255. This is defined in both SDL 1.2 and 2.0.
Where there are mathematical operations on alpha channel which assumes a value of 255, leave alpha as hard-coded 255.
Old versions of SDL treated 255 as transparent and 0 as opaque - there are still instances where alpha is 0 in a non-transparency situation, but these seem okay. Possibly because there is no alpha blending involved.


  Commit: 1181a401edc3ec1910d1c97bb61f3de8303edf6f
      https://github.com/wesnoth/wesnoth/commit/1181a401edc3ec1910d1c97bb61f3de8303edf6f
  Author: Andreas <andreas at alternating.net>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M src/attack_prediction_display.cpp
    M src/display.cpp
    M src/display_chat_manager.cpp
    M src/game_initialization/multiplayer.cpp
    M src/game_initialization/multiplayer_create.cpp
    M src/gui/widgets/window.cpp
    M src/image_modifications.cpp
    M src/joystick.cpp
    M src/marked-up_text.cpp
    M src/minimap.cpp
    M src/playmp_controller.cpp
    M src/sdl/rect.hpp
    M src/sdl/utils.cpp
    M src/sdl/utils.hpp
    M src/storyscreen/render.cpp
    M src/tests/test_image_modifications.cpp

  Log Message:
  -----------
  Merge pull request #503 from Wedge009/sdl2_minor_changes

SDL2 Minor Changes


  Commit: 02563ac17678f6cf9e46b7684b34de10e1c43be1
      https://github.com/wesnoth/wesnoth/commit/02563ac17678f6cf9e46b7684b34de10e1c43be1
  Author: aquileia <sk.aquileia at gmail.com>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M projectfiles/VC9/wesnoth.vcproj

  Log Message:
  -----------
  vcproj: Update for 3c11aa6 & 3ed4eed


  Commit: eb55fe772f3eb198dc180b25b1e3e0a34bb73621
      https://github.com/wesnoth/wesnoth/commit/eb55fe772f3eb198dc180b25b1e3e0a34bb73621
  Author: aquileia <sk.aquileia at gmail.com>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M projectfiles/VC9/schema_generator.vcproj
    M projectfiles/VC9/wesnoth.vcproj
    M projectfiles/VC9/wesnothd.vcproj

  Log Message:
  -----------
  vcproj: SDL2 update


  Commit: acc9afe9a9cb491540421d767e47384bbe7fbcc3
      https://github.com/wesnoth/wesnoth/commit/acc9afe9a9cb491540421d767e47384bbe7fbcc3
  Author: aquileia <sk.aquileia at gmail.com>
  Date:   2015-09-26 (Sat, 26 Sep 2015)

  Changed paths:
    M src/ai/default/contexts.hpp

  Log Message:
  -----------
  Fix VC9 compilation

Due to
    #def EXPLICIT explicit
in VC9's dvec.h file, the TYPE enum was broken for SDL2 builds.


  Commit: 0c27eb94906a3ffa70930c0bc21cd929a17b3705
      https://github.com/wesnoth/wesnoth/commit/0c27eb94906a3ffa70930c0bc21cd929a17b3705
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-10-12 (Mon, 12 Oct 2015)

  Changed paths:
    M src/about.cpp
    M src/dialogs.cpp
    M src/display.cpp
    M src/editor/palette/item_palette.cpp
    M src/editor/palette/unit_palette.cpp
    M src/game_initialization/multiplayer_wait.cpp
    M src/gui/auxiliary/event/handler.cpp
    M src/gui/widgets/window.cpp
    M src/help/help_text_area.cpp
    M src/loadscreen.cpp
    M src/video.cpp
    M src/video.hpp
    M src/widgets/progressbar.cpp
    M src/widgets/scrollbar.cpp
    M src/widgets/slider.cpp
    M src/widgets/textbox.cpp

  Log Message:
  -----------
  Only use references to the screen surface.

This change makes sure that only references are used to the video
surface instead of a copy. This will help to avoid stale values after
a resize event has occured where it will cause a crash due to a stale
pointer.


  Commit: 449aed0a64e6b00e3f53d450a2a9dcaefebab306
      https://github.com/wesnoth/wesnoth/commit/449aed0a64e6b00e3f53d450a2a9dcaefebab306
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-10-13 (Tue, 13 Oct 2015)

  Changed paths:
    M src/events.cpp
    M src/events.hpp
    M src/gui/widgets/grid.cpp
    M src/hotkey/hotkey_preferences_display.cpp
    M src/loadscreen.cpp
    M src/video.cpp
    M src/video.hpp

  Log Message:
  -----------
  Fix Bug #23908 - Crash on resize with SDL2.

SDL2 uses shared memory to communicate with the graphics system when
using a software renderer. A resize event will cause SDL2 to
invalidate the SDL_surface that relies on shared memory and any
subsequent calls to will be SDL_GetWindowSurface will cause the shared
memory do be unmapped as the old surface is released.  This is
problematic when it occurs during a rendering cycle, because the
software rendered may also invoke SDL_GetWindowSurface, making any
references to that surface that the game contains become stale. This
will in turn cause a segmentation fault during blitting.


  Commit: e686200a2df006b18910a656f553f23164684f1f
      https://github.com/wesnoth/wesnoth/commit/e686200a2df006b18910a656f553f23164684f1f
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-10-13 (Tue, 13 Oct 2015)

  Changed paths:
    M src/dialogs.cpp
    M src/tools/dummy_video.cpp

  Log Message:
  -----------
  Update dummy_video to have the correct surface signature.

I forgot to update dummy_video.cpp in commit
0c27eb94906a3ffa70930c0bc21cd929a17b3705, which causes travis compiles
to fail.


  Commit: 5890e3c167e71074eb0067aa5b715129a303e0ec
      https://github.com/wesnoth/wesnoth/commit/5890e3c167e71074eb0067aa5b715129a303e0ec
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-10-13 (Tue, 13 Oct 2015)

  Changed paths:
    M src/tools/dummy_video.cpp

  Log Message:
  -----------
  Fix compile error in dummy_video.cpp


  Commit: da98c62d4fd7ec0ddac324bd6b821fb912865bb3
      https://github.com/wesnoth/wesnoth/commit/da98c62d4fd7ec0ddac324bd6b821fb912865bb3
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-10-14 (Wed, 14 Oct 2015)

  Changed paths:
    M src/attack_prediction_display.cpp
    M src/display.cpp
    M src/display.hpp
    M src/font.cpp
    M src/font.hpp
    M src/game_initialization/multiplayer_create.cpp
    M src/halo.cpp
    M src/marked-up_text.cpp
    M src/marked-up_text.hpp

  Log Message:
  -----------
  Bug #23908 - Don't hold copies of the window surface

Change more copies of the window surface to be references
instead. This will make sure they do not contain a stale version that
has a pointer that points to freed memory.


  Commit: ae1d36431813bdefe34b3b6fec53ff563f5f55c8
      https://github.com/wesnoth/wesnoth/commit/ae1d36431813bdefe34b3b6fec53ff563f5f55c8
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-10-15 (Thu, 15 Oct 2015)

  Changed paths:
    M RELEASE_NOTES
    M attic/maps/5t_Trapped.map
    M attic/maps/A_Snowy_Mountain.map
    M attic/maps/Between_Fire_And_Sword.map
    M attic/maps/Finding_The_Elves.map
    M changelog
    M data/advanced_preferences.cfg
    M data/ai/maps/scenario-AI_Arena_small.map
    M data/ai/maps/scenario-test_move_to_targets.map
    M data/ai/micro_ais/maps/animals.map
    M data/ai/micro_ais/maps/bottleneck_defense.map
    M data/ai/micro_ais/maps/goto.map
    M data/ai/micro_ais/maps/lurkers.map
    M data/ai/micro_ais/maps/messenger_escort.map
    M data/ai/micro_ais/maps/protect_unit.map
    M data/ai/scenarios/scenario-lua-ai.cfg
    M data/ai/scenarios/scenario-no_engine.cfg
    M data/campaigns/An_Orcish_Incursion/_main.cfg
    M data/campaigns/Dead_Water/_main.cfg
    M data/campaigns/Dead_Water/maps/Bilheld.map
    M data/campaigns/Dead_Water/maps/Home_1.map
    M data/campaigns/Dead_Water/maps/Home_2.map
    M data/campaigns/Dead_Water/maps/Slavers.map
    M data/campaigns/Dead_Water/maps/Talking_To_Tyegea.map
    M data/campaigns/Dead_Water/maps/The_Flaming_Sword.map
    M data/campaigns/Dead_Water/maps/The_Mage.map
    M data/campaigns/Dead_Water/maps/Tirigaz.map
    M data/campaigns/Dead_Water/maps/Uncharted_Islands.map
    M data/campaigns/Dead_Water/maps/Wolf_Coast.map
    M data/campaigns/Dead_Water/scenarios/02_Flight.cfg
    M data/campaigns/Delfadors_Memoirs/_main.cfg
    M data/campaigns/Delfadors_Memoirs/maps/01_Overture.map
    M data/campaigns/Delfadors_Memoirs/maps/02_This_Valley_Belongs_to_Me.map
    M data/campaigns/Delfadors_Memoirs/maps/03_The_Road_to_Weldyn.map
    M data/campaigns/Delfadors_Memoirs/maps/04_Leollyn.map
    M data/campaigns/Delfadors_Memoirs/maps/05_Council_in_Weldyn.map
    M data/campaigns/Delfadors_Memoirs/maps/06_The_Swamps_of_Illuven.map
    M data/campaigns/Delfadors_Memoirs/maps/07_Night_in_the_Swamp.map
    M data/campaigns/Delfadors_Memoirs/maps/08_Ur-Thorodor.map
    M data/campaigns/Delfadors_Memoirs/maps/09_Houses_of_the_Dead.map
    M data/campaigns/Delfadors_Memoirs/maps/10_The_Gate_Between_Worlds.map
    M data/campaigns/Delfadors_Memoirs/maps/11_Wasteland.map
    M data/campaigns/Delfadors_Memoirs/maps/12_Terror_at_the_Ford_of_Parthyn.map
    M data/campaigns/Delfadors_Memoirs/maps/13_The_Return_of_Trouble.map
    M data/campaigns/Delfadors_Memoirs/maps/14_Shadows_in_the_Dark.map
    M data/campaigns/Delfadors_Memoirs/maps/15_Save_the_King.map
    M data/campaigns/Delfadors_Memoirs/maps/17_A_New_Ally.map
    M data/campaigns/Delfadors_Memoirs/maps/18_The_Portal_of_Doom.map
    M data/campaigns/Delfadors_Memoirs/maps/19_Showdown_in_the_Northern_Swamp.map
    M data/campaigns/Delfadors_Memoirs/maps/20_Prince_of_Wesnoth.map
    M data/campaigns/Delfadors_Memoirs/maps/21_Clash_at_the_Manor.map
    M data/campaigns/Delfadors_Memoirs/maps/22_Face_of_the_Enemy.map
    M data/campaigns/Descent_Into_Darkness/_main.cfg
    M data/campaigns/Eastern_Invasion/_main.cfg
    M data/campaigns/Eastern_Invasion/maps/05_Northern_Outpost.map
    M data/campaigns/Eastern_Invasion/maps/06_Two_Paths.map
    M data/campaigns/Eastern_Invasion/maps/08_Training_the_Ogres.map
    M data/campaigns/Eastern_Invasion/maps/10_Lake_Vrug.map
    M data/campaigns/Eastern_Invasion/maps/12_Evacuation.map
    M data/campaigns/Eastern_Invasion/maps/13_The_Drowned_Plains.map
    M data/campaigns/Eastern_Invasion/maps/17a_The_Duel.map
    M data/campaigns/Eastern_Invasion/scenarios/10_Lake_Vrug.cfg
    M data/campaigns/Heir_To_The_Throne/_main.cfg
    M data/campaigns/Heir_To_The_Throne/maps/01_The_Elves_Besieged.map
    M data/campaigns/Heir_To_The_Throne/maps/02_Blackwater_Port.map
    M data/campaigns/Heir_To_The_Throne/maps/03_The_Isle_of_Alduin.map
    M data/campaigns/Heir_To_The_Throne/maps/04_The_Bay_of_Pearls.map
    M data/campaigns/Heir_To_The_Throne/maps/05a_Muff_Malal_Peninsula.map
    M data/campaigns/Heir_To_The_Throne/maps/05b_Isle_of_the_Damned.map
    M data/campaigns/Heir_To_The_Throne/maps/06_The_Siege_of_Elensefar.map
    M data/campaigns/Heir_To_The_Throne/maps/07_Crossroads.map
    M data/campaigns/Heir_To_The_Throne/maps/08_The_Princess_of_Wesnoth.map
    M data/campaigns/Heir_To_The_Throne/maps/09_The_Valley_of_Death.map
    M data/campaigns/Heir_To_The_Throne/maps/10_Gryphon_Mountain.map
    M data/campaigns/Heir_To_The_Throne/maps/11_The_Ford_of_Abez.map
    M data/campaigns/Heir_To_The_Throne/maps/12_Northern_Winter.map
    M data/campaigns/Heir_To_The_Throne/maps/13_The_Dwarven_Doors.map
    M data/campaigns/Heir_To_The_Throne/maps/14_Plunging_Into_the_Darkness.map
    M data/campaigns/Heir_To_The_Throne/maps/15_The_Lost_General.map
    M data/campaigns/Heir_To_The_Throne/maps/16_Hasty_Alliance.map
    M data/campaigns/Heir_To_The_Throne/maps/18_A_Choice_Must_Be_Made.map
    M data/campaigns/Heir_To_The_Throne/maps/19a_Snow_Plains.map
    M data/campaigns/Heir_To_The_Throne/maps/19b_Swamp_Of_Dread.map
    M data/campaigns/Heir_To_The_Throne/maps/19c_Cliffs_of_Thoria.map
    M data/campaigns/Heir_To_The_Throne/maps/20a_North_Elves.map
    M data/campaigns/Heir_To_The_Throne/maps/20b_Underground_Channels.map
    M data/campaigns/Heir_To_The_Throne/maps/21_Elven_Council.map
    M data/campaigns/Heir_To_The_Throne/maps/22_Return_to_Wesnoth.map
    M data/campaigns/Heir_To_The_Throne/maps/23_Test_of_the_Clans.map
    M data/campaigns/Heir_To_The_Throne/maps/24_Battle_for_Wesnoth.map
    A data/campaigns/Heir_To_The_Throne/masks/17_Scepter_of_Fire.mask
    M data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
    M data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg
    M data/campaigns/Legend_of_Wesmere/_main.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg
    M data/campaigns/Liberty/_main.cfg
    M data/campaigns/Liberty/maps/01_The_Raid.map
    M data/campaigns/Liberty/maps/02_Civil_Disobedience.map
    M data/campaigns/Liberty/maps/03_Strategy_of_Hope.map
    M data/campaigns/Liberty/maps/04_Unlawful_Orders.map
    M data/campaigns/Liberty/maps/05_Hide_and_Seek.map
    M data/campaigns/Liberty/maps/06_The_Grey_Woods.map
    M data/campaigns/Liberty/maps/07_The_Hunters.map
    M data/campaigns/Liberty/maps/08_Glory.map
    M data/campaigns/Liberty/scenarios/08_Glory.cfg
    M data/campaigns/Northern_Rebirth/_main.cfg
    M data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg
    M data/campaigns/Sceptre_of_Fire/_main.cfg
    M data/campaigns/Sceptre_of_Fire/maps/1_A_Bargain_is_Struck.map
    M data/campaigns/Sceptre_of_Fire/maps/2_Closing_the_Gates.map
    M data/campaigns/Sceptre_of_Fire/maps/2t_In_the_Dwarven_City.map
    M data/campaigns/Sceptre_of_Fire/maps/3_Searching_for_the_Runecrafter.map
    M data/campaigns/Sceptre_of_Fire/maps/3t_The_Council_Regathers.map
    M data/campaigns/Sceptre_of_Fire/maps/4_Gathering_Materials-random.mask
    M data/campaigns/Sceptre_of_Fire/maps/4t_The_Jeweler.map
    M data/campaigns/Sceptre_of_Fire/maps/5_Hills_of_the_Shorbear_Clan.map
    M data/campaigns/Sceptre_of_Fire/maps/6_Towards_the_Caves.map
    M data/campaigns/Sceptre_of_Fire/maps/7_Outriding_the_Outriders.map
    M data/campaigns/Sceptre_of_Fire/maps/8_The_Dragon.map
    M data/campaigns/Sceptre_of_Fire/maps/9_Caverns_of_Flame.map
    M data/campaigns/Sceptre_of_Fire/maps/9_overlay/9_o1.mask
    M data/campaigns/Sceptre_of_Fire/maps/9_overlay/9_o2.mask
    M data/campaigns/Sceptre_of_Fire/maps/9_overlay/9_o3.mask
    M data/campaigns/Sceptre_of_Fire/maps/9_overlay/9_o4.mask
    M data/campaigns/Sceptre_of_Fire/maps/9_overlay/9_o5.mask
    M data/campaigns/Sceptre_of_Fire/maps/9_overlay/9_o6.mask
    M data/campaigns/Sceptre_of_Fire/maps/9_overlay/9_o7.mask
    M data/campaigns/Sceptre_of_Fire/maps/9_overlay/9_o8.mask
    M data/campaigns/Sceptre_of_Fire/maps/9_overlay/9_o9.mask
    M data/campaigns/Sceptre_of_Fire/maps/9_overlay/9_of.mask
    M data/campaigns/Sceptre_of_Fire/maps/Epilogue.map
    M data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
    M data/campaigns/Son_Of_The_Black_Eye/_main.cfg
    M data/campaigns/Son_Of_The_Black_Eye/maps/01_End_of_Peace.map
    M data/campaigns/Son_Of_The_Black_Eye/maps/03_Toward_Mountains_of_Haag.map
    M data/campaigns/Son_Of_The_Black_Eye/maps/04_The_Siege_of_Barag_Gor.map
    M data/campaigns/Son_Of_The_Black_Eye/maps/05_To_the_Harbor_of_Tirigaz.map
    M data/campaigns/Son_Of_The_Black_Eye/maps/06_Black_Flag.map
    M data/campaigns/Son_Of_The_Black_Eye/maps/07_The_Desert_of_Death.map
    M data/campaigns/Son_Of_The_Black_Eye/maps/08_Silent_Forest.map
    M data/campaigns/Son_Of_The_Black_Eye/maps/09_Shan_Taum_the_Smug.map
    M data/campaigns/Son_Of_The_Black_Eye/maps/10_Saving_Inarix.map
    M data/campaigns/Son_Of_The_Black_Eye/maps/11_Clash_of_Armies.map
    M data/campaigns/Son_Of_The_Black_Eye/maps/12_Giving_Some_Back.map
    M data/campaigns/Son_Of_The_Black_Eye/maps/13_The_Dwarvish_Stand.map
    M data/campaigns/Son_Of_The_Black_Eye/maps/14_Back_Home.map
    M data/campaigns/Son_Of_The_Black_Eye/maps/15_Civil_War.map
    M data/campaigns/Son_Of_The_Black_Eye/maps/16_The_Coward.map
    M data/campaigns/Son_Of_The_Black_Eye/maps/17_The_Human_Attack.map
    M data/campaigns/Son_Of_The_Black_Eye/maps/18_Northern_Alliance.map
    M data/campaigns/The_Hammer_of_Thursagan/_main.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/07_Mages_and_Drakes.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/_main.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/maps/01_A_Summer_of_Storms.map
    M data/campaigns/The_Rise_Of_Wesnoth/maps/02_The_Fall.map
    M data/campaigns/The_Rise_Of_Wesnoth/maps/03_A_Harrowing_Escape.map
    M data/campaigns/The_Rise_Of_Wesnoth/maps/04a_The_Swamp_of_Esten.map
    M data/campaigns/The_Rise_Of_Wesnoth/maps/04b_The_Midlands.map
    M data/campaigns/The_Rise_Of_Wesnoth/maps/05_The_Oldwood.map
    M data/campaigns/The_Rise_Of_Wesnoth/maps/06_Temple_in_the_Deep.map
    M data/campaigns/The_Rise_Of_Wesnoth/maps/08_Clearwater_Port.map
    M data/campaigns/The_Rise_Of_Wesnoth/maps/09_Fallen_Lich_Point.map
    M data/campaigns/The_Rise_Of_Wesnoth/maps/10_Sewer_of_Southbay.map
    M data/campaigns/The_Rise_Of_Wesnoth/maps/11_Southbay_in_Winter.map
    M data/campaigns/The_Rise_Of_Wesnoth/maps/12_A_Final_Spring.map
    M data/campaigns/The_Rise_Of_Wesnoth/maps/13_Peoples_in_Decline.map
    M data/campaigns/The_Rise_Of_Wesnoth/maps/14_Rough_Landing.map
    M data/campaigns/The_Rise_Of_Wesnoth/maps/15_A_New_Land.map
    M data/campaigns/The_Rise_Of_Wesnoth/maps/16_The_Kalian.map
    M data/campaigns/The_Rise_Of_Wesnoth/maps/17a_The_Dragon.map
    M data/campaigns/The_Rise_Of_Wesnoth/maps/17b_Lizard_Beach.map
    M data/campaigns/The_Rise_Of_Wesnoth/maps/17c_Troll_Hole.map
    M data/campaigns/The_Rise_Of_Wesnoth/maps/17d_Cursed_Isle.map
    M data/campaigns/The_Rise_Of_Wesnoth/maps/19_The_Vanguard.map
    M data/campaigns/The_Rise_Of_Wesnoth/maps/20_Return_of_the_Fleet.map
    M data/campaigns/The_Rise_Of_Wesnoth/maps/21_The_Plan.map
    M data/campaigns/The_Rise_Of_Wesnoth/maps/22_The_Rise_of_Wesnoth.map
    M data/campaigns/The_South_Guard/_main.cfg
    M data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg
    M data/campaigns/Two_Brothers/_main.cfg
    M data/campaigns/Under_the_Burning_Suns/_main.cfg
    M data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
    M data/core/about.cfg
    M data/core/macros/deprecated-utils.cfg
    M data/core/macros/interface-utils.cfg
    M data/core/macros/scenario-utils.cfg
    M data/core/macros/utils.cfg
    A data/core/sounds/club-miss.ogg
    M data/core/sounds/club.ogg
    A data/core/sounds/mace-miss.ogg
    A data/core/sounds/mace.ogg
    A data/core/sounds/staff-miss.ogg
    A data/core/sounds/staff.ogg
    M data/gui/default/window/campaign_difficulty.cfg
    M data/gui/default/window/editor_edit_side.cfg
    M data/lua/helper.lua
    M data/lua/wml-tags.lua
    M data/lua/wml/message.lua
    M data/lua/wml/object.lua
    M data/multiplayer/factions/drakes-default.cfg
    A data/multiplayer/maps/6p_Team_Survival.map
    M data/multiplayer/scenarios/6p_Team_Survival.cfg
    M data/multiplayer/scenarios/Wesbench_AI.cfg
    M data/multiplayer/scenarios/Wesbench_Scroll.cfg
    M data/multiplayer/scenarios/Wesbench_Shroud_Walk.cfg
    M data/scenario-formula-recruitment.cfg
    M data/scenario-formula.cfg
    M data/scenario-leaders.cfg
    M data/scenario-movethrough.cfg
    M data/scenario-poisoning.cfg
    M data/scenario-test.cfg
    M data/test/macros/wml_unit_test_macros.cfg
    M data/test/scenarios/feeding.cfg
    A data/test/scenarios/for-loops.cfg
    M data/test/scenarios/test_relative_dir.cfg
    M data/test/scenarios/test_unit_map.cfg
    M data/test/scenarios/test_victory_attacks.cfg
    M data/themes/_initial.cfg
    M data/themes/default.cfg
    M data/themes/editor.cfg
    M data/tools/wesnoth/campaignserver_client.py
    M po/wesnoth-dm/en_GB.po
    M po/wesnoth-help/en_GB.po
    M po/wesnoth-httt/en_GB.po
    M po/wesnoth-lib/en_GB.po
    M po/wesnoth-manual/en_GB.po
    M po/wesnoth-utbs/en_GB.po
    M po/wesnoth/en_GB.po
    M projectfiles/VC9/wesnoth.sln
    M projectfiles/VC9/wesnoth.vcproj
    M projectfiles/VC9/wesnoth.vcxproj.user
    M projectfiles/VC9/wesnothd.vcproj
    M projectfiles/VC9/wesnothd.vcxproj.user
    M run_wml_tests
    M scons/sdl.py
    M src/ai/lua/core.cpp
    M src/carryover.cpp
    M src/carryover.hpp
    M src/dialogs.cpp
    M src/editor/controller/editor_controller.cpp
    M src/editor/controller/editor_controller.hpp
    M src/editor/editor_preferences.cpp
    M src/editor/editor_preferences.hpp
    M src/editor/map/context_manager.cpp
    M src/editor/map/context_manager.hpp
    M src/editor/map/editor_map.cpp
    M src/editor/map/map_context.cpp
    M src/editor/map/map_context.hpp
    M src/formula_string_utils.cpp
    M src/game_display.hpp
    M src/game_events/action_wml.cpp
    M src/game_initialization/connect_engine.cpp
    M src/game_initialization/connect_engine.hpp
    M src/game_initialization/create_engine.cpp
    M src/game_initialization/multiplayer.cpp
    M src/game_initialization/multiplayer_lobby.cpp
    M src/game_initialization/multiplayer_lobby.hpp
    M src/game_initialization/multiplayer_ui.hpp
    M src/game_initialization/playcampaign.cpp
    M src/game_initialization/playcampaign.hpp
    M src/game_initialization/singleplayer.cpp
    M src/game_launcher.cpp
    M src/game_state.cpp
    M src/game_state.hpp
    M src/generators/cave_map_generator.cpp
    M src/generators/default_map_generator_job.cpp
    M src/gui/dialogs/campaign_difficulty.cpp
    M src/gui/dialogs/campaign_difficulty.hpp
    M src/gui/dialogs/editor/editor_edit_side.cpp
    M src/gui/dialogs/editor/editor_edit_side.hpp
    M src/gui/dialogs/lobby_main.cpp
    M src/gui/dialogs/wml_message.cpp
    M src/gui/dialogs/wml_message.hpp
    M src/hotkey/command_executor.cpp
    M src/hotkey/command_executor.hpp
    M src/hotkey/hotkey_command.cpp
    M src/hotkey/hotkey_command.hpp
    M src/hotkey/hotkey_preferences_display.cpp
    M src/hotkey_handler.hpp
    M src/hotkey_handler_mp.cpp
    M src/hotkey_handler_replay.cpp
    M src/hotkey_handler_replay.hpp
    M src/hotkey_handler_sp.cpp
    M src/hotkey_handler_sp.hpp
    M src/map.cpp
    M src/map.hpp
    M src/menu_events.cpp
    M src/mp_replay_controller.cpp
    M src/mp_replay_controller.hpp
    M src/play_controller.cpp
    M src/play_controller.hpp
    M src/playmp_controller.cpp
    M src/playmp_controller.hpp
    M src/playsingle_controller.cpp
    M src/playsingle_controller.hpp
    M src/playturn.cpp
    M src/playturn.hpp
    M src/replay.cpp
    M src/replay.hpp
    M src/replay_controller.cpp
    M src/replay_controller.hpp
    M src/replay_recorder_base.cpp
    M src/replay_recorder_base.hpp
    M src/saved_game.cpp
    M src/savegame.cpp
    M src/scripting/game_lua_kernel.cpp
    M src/scripting/game_lua_kernel.hpp
    M src/scripting/lua_api.cpp
    M src/scripting/lua_api.hpp
    M src/scripting/lua_common.cpp
    M src/scripting/lua_common.hpp
    M src/scripting/lua_gui2.cpp
    M src/scripting/lua_race.cpp
    M src/scripting/lua_unit_type.cpp
    M src/side_filter.cpp
    M src/synced_user_choice.cpp
    M src/team.cpp
    M src/team.hpp
    M src/tests/gui/test_gui2.cpp
    M src/tests/test_mp_connect.cpp
    M src/tests/utils/play_scenario.cpp
    M src/unit.cpp
    M src/unit.hpp
    M src/unit_attack_type.hpp
    M src/unit_id.hpp
    M src/variable.hpp
    M utils/umc_dev/org.wesnoth/templates/map.map
    M wml_test_schedule

  Log Message:
  -----------
  Merge branch 'master' into sdl2


  Commit: 1890e948e455376562e6191856af34059936af3e
      https://github.com/wesnoth/wesnoth/commit/1890e948e455376562e6191856af34059936af3e
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-10-26 (Mon, 26 Oct 2015)

  Changed paths:
    M CMakeLists.txt
    M RELEASE_NOTES
    M changelog
    M data/campaigns/Dead_Water/units/Kraken.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg
    M data/campaigns/Under_the_Burning_Suns/units/monsters/Small_Mudcrawler.cfg
    M data/core/about.cfg
    A data/core/sounds/ink-miss.ogg
    A data/core/sounds/ink.ogg
    A data/core/sounds/mud-fist-miss.ogg
    A data/core/sounds/mud-fist.ogg
    A data/core/sounds/mud-glob-miss.ogg
    A data/core/sounds/mud-glob.ogg
    M data/core/terrain.cfg
    M data/core/units/monsters/Cuttle_Fish.cfg
    M data/core/units/monsters/Giant_Mudcrawler.cfg
    M data/core/units/monsters/Mudcrawler.cfg
    M data/gui/default/widget/toggle_button_listbox_header.cfg
    M data/gui/default/window/game_load.cfg
    M data/gui/default/window/unit_create.cfg
    M data/test/maps/pathfind_1.cfg
    M data/test/scenarios/filter_vision.cfg
    M data/test/scenarios/has_ally.cfg
    M data/test/scenarios/move_skip_sighted.cfg
    M data/test/scenarios/test_check_victory.cfg
    M data/test/scenarios/test_move.cfg
    M data/tools/GUI.pyw
    M data/tools/wmlindent
    M data/tools/wmllint
    M data/tools/wmlscope
    A images/icons/alignments/alignment_chaotic_30.png
    A images/icons/alignments/alignment_lawful_30.png
    A images/icons/alignments/alignment_liminal_30.png
    A images/icons/alignments/alignment_neutral_30.png
    R images/misc/l10n/en at shaw/logo.png
    R images/misc/l10n/es/logo.png
    R images/misc/l10n/fr/logo.png
    R images/misc/l10n/gd/logo.png
    R images/misc/l10n/gl/logo.png
    R images/misc/l10n/hu/logo.png
    R images/misc/l10n/la/logo.png
    R images/misc/l10n/lt/logo.png
    R images/misc/l10n/nl/logo.png
    R images/misc/l10n/pt/logo.png
    R images/misc/l10n/sr/logo.png
    R images/misc/l10n/sr at latin/logo.png
    R images/misc/l10n/vi/logo.png
    R images/misc/l10n/zh_CN/logo.png
    M l10n-track
    M packaging/windows/Wesnoth.nsi.in
    M players_changelog
    M projectfiles/CodeBlocks/wesnoth.cbp
    M projectfiles/VC9/WindowsTimeout.vcproj
    M projectfiles/VC9/liblua.vcproj
    M projectfiles/VC9/schema_generator.vcproj
    M projectfiles/VC9/wesnoth.vcproj
    M projectfiles/VC9/wesnothd.vcproj
    M projectfiles/VC9/wesnothlib.vcproj
    M src/CMakeLists.txt
    M src/ai/formula/function_table.cpp
    M src/ai/testing/ca_global_fallback.cpp
    M src/dialogs.cpp
    M src/dialogs.hpp
    M src/display.cpp
    M src/display.hpp
    M src/display_chat_manager.cpp
    M src/display_chat_manager.hpp
    M src/display_context.cpp
    M src/editor/action/action_label.cpp
    M src/editor/action/action_label.hpp
    M src/editor/action/mouse/mouse_action_map_label.cpp
    M src/editor/map/context_manager.cpp
    M src/editor/map/context_manager.hpp
    M src/editor/map/map_context.cpp
    M src/filesystem_boost.cpp
    M src/game_config.cpp
    M src/game_config.hpp
    M src/game_display.cpp
    M src/game_display.hpp
    M src/game_initialization/connect_engine.cpp
    M src/game_initialization/connect_engine.hpp
    M src/game_initialization/create_engine.cpp
    M src/game_initialization/multiplayer.cpp
    M src/game_initialization/multiplayer_create.cpp
    M src/game_initialization/multiplayer_wait.cpp
    M src/gui/dialogs/campaign_settings.cpp
    M src/gui/dialogs/depcheck_select_new.cpp
    M src/gui/dialogs/editor/editor_edit_label.cpp
    M src/gui/dialogs/editor/editor_edit_side.cpp
    M src/gui/dialogs/editor/editor_edit_side.hpp
    M src/gui/dialogs/game_load.cpp
    M src/gui/dialogs/game_version.hpp
    M src/gui/dialogs/gamestate_inspector.cpp
    M src/gui/dialogs/label_settings.cpp
    M src/gui/dialogs/unit_create.cpp
    M src/gui/dialogs/unit_create.hpp
    M src/gui/widgets/generator.cpp
    M src/gui/widgets/list.cpp
    M src/hotkey/hotkey_command.cpp
    M src/leader_scroll_dialog.cpp
    M src/map_label.cpp
    M src/map_label.hpp
    M src/menu_events.cpp
    M src/minimap.cpp
    M src/overlay.hpp
    M src/play_controller.cpp
    M src/replay.cpp
    M src/savegame.cpp
    M src/savegame.hpp
    M src/scripting/game_lua_kernel.cpp
    M src/scripting/lua_team.cpp
    M src/server/game.cpp
    M src/server/game.hpp
    M src/side_filter.cpp
    M src/team.cpp
    M src/team.hpp
    M src/terrain_builder.cpp
    M src/tests/test_team.cpp
    M src/unit_types.cpp
    M src/unit_types.hpp

  Log Message:
  -----------
  Merge branch 'master' into sdl2


  Commit: c89f1620e185373ef695b90a9b54e8630c183135
      https://github.com/wesnoth/wesnoth/commit/c89f1620e185373ef695b90a9b54e8630c183135
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-10-26 (Mon, 26 Oct 2015)

  Changed paths:
    M src/editor/map/context_manager.cpp

  Log Message:
  -----------
  Update window title for the editor under SDL2 too


  Commit: afde826f226aeb30d0eb677a83c465f1f5f7d243
      https://github.com/wesnoth/wesnoth/commit/afde826f226aeb30d0eb677a83c465f1f5f7d243
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-10-30 (Fri, 30 Oct 2015)

  Changed paths:
    M src/game_initialization/multiplayer_configure.cpp
    M src/game_initialization/multiplayer_wait.cpp
    M src/widgets/file_menu.cpp
    M src/widgets/menu.cpp
    M src/widgets/scrollpane.cpp
    M src/widgets/widget.cpp
    M src/widgets/widget.hpp

  Log Message:
  -----------
  Fix bug #23908 - Crash in SDL_BlitSurface caused by integer underflow

The font rendering code under SDL2 seems to deal poorly with silly
values being passed to it as a cause of integer over/underflows. This
commit changes the types used in gui1 from unsigned to signed for
width and height. This causes a number of statements that previously
inadvertedly did unsigned arithmetics without over/underflow checking
to be doing signed arithmetics instead, which is probably what the
author intended.


  Commit: 55f7b28720f2749d543fabfbdd3037faa1f86c80
      https://github.com/wesnoth/wesnoth/commit/55f7b28720f2749d543fabfbdd3037faa1f86c80
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-10-30 (Fri, 30 Oct 2015)

  Changed paths:
    M src/widgets/textbox.cpp

  Log Message:
  -----------
  Fix alpha blending of text in gui1 textbox

This disables alpha-blending when a copy of the text surface is
blitted on top of the original.


  Commit: 94b93a8fa3c982ed288b9c654eb8a53c130c3b73
      https://github.com/wesnoth/wesnoth/commit/94b93a8fa3c982ed288b9c654eb8a53c130c3b73
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-11-01 (Sun, 01 Nov 2015)

  Changed paths:
    M src/loadscreen.cpp

  Log Message:
  -----------
  Fix crash caused by a resize event during the loading screen

The window event handling under SDL2 was incorrectly relying on
SDL_event.window.type for sub-events for SDL_WINDOWEVENT. This
resulted in the if-statements supposed to catch certain window-events
to always evaluate to false, causing the code to never run.


  Commit: 3036b4ee49efdb826e79d39c08fffe03ebcd2146
      https://github.com/wesnoth/wesnoth/commit/3036b4ee49efdb826e79d39c08fffe03ebcd2146
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M RELEASE_NOTES
    M changelog
    M data/core/terrain.cfg
    M data/tools/GUI.pyw
    M data/tools/wmlindent
    M data/tools/wmllint
    M data/tools/wmlscope
    M images/icons/alignments/alignment_lawful_30.png
    M images/icons/alignments/alignment_neutral_30.png
    A images/misc/l10n/af/logo.png
    A images/misc/l10n/ang/logo.png
    A images/misc/l10n/ang at latin/logo.png
    A images/misc/l10n/bg/logo.png
    A images/misc/l10n/ca/logo.png
    A images/misc/l10n/cs/logo.png
    A images/misc/l10n/da/logo.png
    A images/misc/l10n/el/logo.png
    A images/misc/l10n/en/logo.png
    A images/misc/l10n/en at shaw/logo.png
    A images/misc/l10n/eo/logo.png
    A images/misc/l10n/es/logo.png
    A images/misc/l10n/et/logo.png
    A images/misc/l10n/eu/logo.png
    A images/misc/l10n/fi/logo.png
    A images/misc/l10n/fr/logo.png
    A images/misc/l10n/ga/logo.png
    A images/misc/l10n/gd/logo.png
    A images/misc/l10n/gl/logo.png
    A images/misc/l10n/he/logo.png
    A images/misc/l10n/hr/logo.png
    A images/misc/l10n/hu/logo.png
    A images/misc/l10n/id/logo.png
    A images/misc/l10n/is/logo.png
    A images/misc/l10n/it/logo.png
    A images/misc/l10n/la/logo.png
    A images/misc/l10n/lt/logo.png
    A images/misc/l10n/lv/logo.png
    A images/misc/l10n/mk/logo.png
    A images/misc/l10n/mr/logo.png
    A images/misc/l10n/nl/logo.png
    A images/misc/l10n/pl/logo.png
    A images/misc/l10n/pt/logo.png
    A images/misc/l10n/ru/logo.png
    A images/misc/l10n/sk/logo.png
    A images/misc/l10n/sr/logo.png
    A images/misc/l10n/sr at latin/logo.png
    A images/misc/l10n/tr/logo.png
    A images/misc/l10n/vi/logo.png
    A images/misc/l10n/zh_CN/logo.png
    A images/misc/l10n/zh_TW/logo.png
    M l10n-spec
    M l10n-track
    M players_changelog
    M po/wesnoth-ai/it.po
    M po/wesnoth-ai/ja.po
    M po/wesnoth-ai/racv.po
    M po/wesnoth-anl/ja.po
    M po/wesnoth-anl/racv.po
    M po/wesnoth-aoi/ja.po
    M po/wesnoth-did/en_GB.po
    M po/wesnoth-did/ja.po
    M po/wesnoth-dm/ja.po
    M po/wesnoth-dw/ja.po
    M po/wesnoth-editor/es.po
    M po/wesnoth-editor/gd.po
    M po/wesnoth-editor/it.po
    M po/wesnoth-editor/ja.po
    M po/wesnoth-editor/sk.po
    M po/wesnoth-ei/en_GB.po
    M po/wesnoth-ei/es.po
    M po/wesnoth-ei/it.po
    M po/wesnoth-ei/ja.po
    M po/wesnoth-ei/sk.po
    M po/wesnoth-help/es.po
    M po/wesnoth-help/gd.po
    M po/wesnoth-help/it.po
    M po/wesnoth-help/ja.po
    M po/wesnoth-help/pl.po
    M po/wesnoth-help/racv.po
    M po/wesnoth-help/sk.po
    M po/wesnoth-httt/ja.po
    M po/wesnoth-l/ja.po
    M po/wesnoth-lib/es.po
    M po/wesnoth-lib/gd.po
    M po/wesnoth-lib/it.po
    M po/wesnoth-lib/ja.po
    M po/wesnoth-lib/pl.po
    M po/wesnoth-lib/racv.po
    M po/wesnoth-lib/sk.po
    M po/wesnoth-low/ja.po
    M po/wesnoth-manpages/ja.po
    M po/wesnoth-manual/ja.po
    M po/wesnoth-multiplayer/ja.po
    M po/wesnoth-nr/en_GB.po
    M po/wesnoth-nr/ja.po
    M po/wesnoth-sof/ja.po
    M po/wesnoth-sotbe/ja.po
    M po/wesnoth-tb/ja.po
    M po/wesnoth-test/ja.po
    M po/wesnoth-test/racv.po
    M po/wesnoth-thot/ja.po
    M po/wesnoth-trow/ja.po
    M po/wesnoth-tsg/ja.po
    M po/wesnoth-tutorial/en_GB.po
    M po/wesnoth-tutorial/ja.po
    M po/wesnoth-units/es.po
    M po/wesnoth-units/gd.po
    M po/wesnoth-units/it.po
    M po/wesnoth-units/ja.po
    M po/wesnoth-units/pl.po
    M po/wesnoth-units/racv.po
    M po/wesnoth-units/sk.po
    M po/wesnoth-utbs/en_GB.po
    M po/wesnoth-utbs/ja.po
    M po/wesnoth/es.po
    M po/wesnoth/gd.po
    M po/wesnoth/it.po
    M po/wesnoth/ja.po
    M po/wesnoth/pl.po
    M po/wesnoth/racv.po
    M po/wesnoth/sk.po
    M scons/sdl.py
    M src/display_chat_manager.cpp
    M src/display_chat_manager.hpp
    M src/editor/editor_main.cpp
    M src/game_preferences.cpp
    M src/hotkey/hotkey_preferences_display.cpp
    M src/play_controller.cpp
    M src/scripting/push_check.hpp
    M src/server/server.cpp
    M src/terrain.cpp
    M src/whiteboard/manager.cpp
    M src/whiteboard/move.cpp

  Log Message:
  -----------
  Merge branch 'master' into sdl2


  Commit: 81480d1d774d8c63899cea0a48be6dd716604ffa
      https://github.com/wesnoth/wesnoth/commit/81480d1d774d8c63899cea0a48be6dd716604ffa
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-12-01 (Tue, 01 Dec 2015)

  Changed paths:
    M RELEASE_NOTES
    M changelog
    M data/campaigns/Legend_of_Wesmere/lua/wml_tags.lua
    M data/campaigns/Legend_of_Wesmere/maps/02_Hostile_Mountains.map
    M data/campaigns/Legend_of_Wesmere/maps/04_The_Elvish_Treasury.map
    M data/campaigns/Legend_of_Wesmere/maps/06_Acquaintance_in_Need.map
    M data/campaigns/Legend_of_Wesmere/maps/09_Bounty_Hunters.map
    M data/campaigns/Legend_of_Wesmere/maps/10_Cliffs_of_Thoria.map
    M data/campaigns/Legend_of_Wesmere/maps/11_Battle_of_the_Book.map
    M data/campaigns/Legend_of_Wesmere/maps/14_Human_Alliance.map
    M data/campaigns/Legend_of_Wesmere/maps/Kalian.map
    M data/campaigns/Legend_of_Wesmere/maps/Kalian_map.cfg
    M data/campaigns/Legend_of_Wesmere/maps/Lintanir.map
    M data/campaigns/Legend_of_Wesmere/maps/Saurgrath.map
    M data/campaigns/Legend_of_Wesmere/masks/03_Kalian_under_Attack.mask
    M data/campaigns/Legend_of_Wesmere/masks/05_The_Saurian_Treasury.mask
    M data/campaigns/Legend_of_Wesmere/masks/07_Elves_Last_Stand.mask
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/04_The_Elvish_Treasury.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/08_Council_of_Hard_Choices.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/10_Cliffs_of_Thoria.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/11_Battle_of_the_Book.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/12_Revelations.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/13_News_from_the_Front.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/16_The_Chief_Must_Die.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/17_Breaking_the_Siege.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/19_Costly_Revenge.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/21_Elvish_Assassins.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/22_Northern_Battle.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/23_End_of_War.cfg
    M data/campaigns/Legend_of_Wesmere/utils/bigmap.cfg
    M data/campaigns/Legend_of_Wesmere/utils/characters.cfg
    A data/campaigns/Legend_of_Wesmere/utils/debug.cfg
    M data/campaigns/Legend_of_Wesmere/utils/low-macros.cfg
    M data/campaigns/Legend_of_Wesmere/utils/map-utils.cfg
    M data/lua/wml-tags.lua
    M data/lua/wml/message.lua
    M projectfiles/CodeBlocks/wesnoth.cbp
    M projectfiles/CodeBlocks/wesnothd.cbp
    M projectfiles/VC9/wesnoth.vcproj
    M projectfiles/VC9/wesnothlib.vcproj
    M scons/sdl.py
    M src/CMakeLists.txt
    M src/SConscript
    R src/desktop/windows_console.cpp
    R src/desktop/windows_console.hpp
    M src/filesystem_boost.cpp
    M src/game_initialization/connect_engine.cpp
    M src/game_initialization/multiplayer.cpp
    M src/game_initialization/playcampaign.cpp
    M src/gui/dialogs/game_version.cpp
    A src/libc_error.hpp
    A src/log_windows.cpp
    A src/log_windows.hpp
    M src/scripting/game_lua_kernel.cpp
    M src/scripting/lua_team.cpp
    M src/server/game.cpp
    M src/team.cpp
    M src/team.hpp
    M src/variable_info.cpp
    M src/wesnoth.cpp
    M src/whiteboard/recruit.cpp
    M utils/pofix.py

  Log Message:
  -----------
  Merge branch 'master' into sdl2


  Commit: 3a5b122325cc241b5e45ab38eb30fa8399131fee
      https://github.com/wesnoth/wesnoth/commit/3a5b122325cc241b5e45ab38eb30fa8399131fee
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-12-02 (Wed, 02 Dec 2015)

  Changed paths:
    M src/events.cpp

  Log Message:
  -----------
  Peek for redraw events after each call to SDL_PollEvent.

Since SDL_PollEvent internally pumps events there is is a chance that there will be a redraw event added to the SDL event queue, which could cause a crash if there is a game DRAW event before it in the event queue. This should fix it, but it's not the prettiest of fix and should be rewritten if it works to instead put draw events to the start of the internal event queue after it's been drained.


  Commit: 4456dcbfafbcef9fb94711dbf16802ae5e0c472e
      https://github.com/wesnoth/wesnoth/commit/4456dcbfafbcef9fb94711dbf16802ae5e0c472e
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2015-12-02 (Wed, 02 Dec 2015)

  Changed paths:
    M SConstruct

  Log Message:
  -----------
  scons: added ctool option to specify c compiler command

if cxxtool option is unspecified it will be derived from ctool


  Commit: f709b8ee8fb15763ee4f415c470057b65f1aef4f
      https://github.com/wesnoth/wesnoth/commit/f709b8ee8fb15763ee4f415c470057b65f1aef4f
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2015-12-02 (Wed, 02 Dec 2015)

  Changed paths:
    M SConstruct

  Log Message:
  -----------
  scons: Added an option to support using multilib gcc in 32-bit mode

multilib_arch=32 will pass -m32 to both compiler and linker causing multilib gcc to produce 32bit binaries.


  Commit: ed780b0058bd09f0e8b746fae4077bd65fcd3505
      https://github.com/wesnoth/wesnoth/commit/ed780b0058bd09f0e8b746fae4077bd65fcd3505
  Author: aquileia <sk.aquileia at gmail.com>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

  Changed paths:
    M projectfiles/VC9/WindowsTimeout.vcproj
    M projectfiles/VC9/liblua.vcproj
    M projectfiles/VC9/schema_generator.vcproj
    M projectfiles/VC9/wesnoth.vcproj
    M projectfiles/VC9/wesnothd.vcproj
    M projectfiles/VC9/wesnothlib.vcproj

  Log Message:
  -----------
  vcproj: Disable stack validity check

The instructions to confirm the stack pointer position led to poorly
optimized code and abysmal performance. This made the debug configuration
basically useless.

This fix is based on
randomascii.wordpress.com/2011/07/22/visual-c-debug-buildsfast-checks-cause-5x-slowdowns/


  Commit: 36456df46f6e4e1507ef3f99ad953c1d26fe3eb9
      https://github.com/wesnoth/wesnoth/commit/36456df46f6e4e1507ef3f99ad953c1d26fe3eb9
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-12-05 (Sat, 05 Dec 2015)

  Changed paths:
    M src/events.cpp
    M src/gui/widgets/grid.cpp
    M src/loadscreen.cpp
    M src/video.cpp
    M src/video.hpp

  Log Message:
  -----------
  Fixes bug #24138 and disables SDL_PumpEvent() in grid.cpp

This removes the usage of the display::get_singleton() in the event
handling code since it may cause incorrect behaviour (crash) when the
singleton has been incorrectly set to null.

This also removes SDL_PumpEvents() from grid.cpp the rendering code
should not be directly interacting with the event handling and it's
causing instabilities.


  Commit: 5c187a518566b09d70fd6bfa40eb2cac9554fa48
      https://github.com/wesnoth/wesnoth/commit/5c187a518566b09d70fd6bfa40eb2cac9554fa48
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-12-05 (Sat, 05 Dec 2015)

  Changed paths:
    M SConstruct
    M projectfiles/VC9/WindowsTimeout.vcproj
    M projectfiles/VC9/liblua.vcproj
    M projectfiles/VC9/schema_generator.vcproj
    M projectfiles/VC9/wesnoth.vcproj
    M projectfiles/VC9/wesnothd.vcproj
    M projectfiles/VC9/wesnothlib.vcproj

  Log Message:
  -----------
  Merge branch 'sdl2' of github.com:wesnoth/wesnoth into sdl2


  Commit: 3240d4a2ef40c773935e19a885b80793939fae25
      https://github.com/wesnoth/wesnoth/commit/3240d4a2ef40c773935e19a885b80793939fae25
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-12-19 (Sat, 19 Dec 2015)

  Changed paths:
    M src/gui/widgets/window.cpp
    M src/preferences_display.cpp
    M src/video.cpp

  Log Message:
  -----------
  Force a full redraw on resize events.

This fixes the worst of the resize-related artefacts during gameplay
by forcing a full redraw on every resize event. These changes will be
revisited as a part of #23934.


  Commit: 2c1f3ef540df4d8a759b71c9f5a2600306b0547a
      https://github.com/wesnoth/wesnoth/commit/2c1f3ef540df4d8a759b71c9f5a2600306b0547a
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-12-19 (Sat, 19 Dec 2015)

  Changed paths:
    M .gitignore
    M Doxyfile
    M RELEASE_NOTES
    M changelog
    M data/campaigns/Dead_Water/images/maps/l10n/de/dw--overlay.png
    M data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
    M data/campaigns/Eastern_Invasion/scenarios/13_The_Drowned_Plains.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg
    M data/campaigns/Legend_of_Wesmere/lua/wml_tags.lua
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/04_The_Elvish_Treasury.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/10_Cliffs_of_Thoria.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/11_Battle_of_the_Book.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/13_News_from_the_Front.cfg
    M data/campaigns/Legend_of_Wesmere/utils/low-macros.cfg
    M data/campaigns/Northern_Rebirth/_main.cfg
    M data/campaigns/Northern_Rebirth/maps/12a_Get_the_Gold.map
    M data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg
    M data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
    M data/campaigns/Northern_Rebirth/scenarios/03_To_the_Mines.cfg
    M data/campaigns/Northern_Rebirth/scenarios/04_Clearing_the_Mines.cfg
    M data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg
    M data/campaigns/Northern_Rebirth/scenarios/05b_Compelled.cfg
    M data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg
    M data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
    M data/campaigns/Northern_Rebirth/scenarios/07b_Protecting_the_Master.cfg
    M data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg
    M data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.cfg
    M data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
    M data/campaigns/Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg
    M data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
    M data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
    M data/campaigns/Sceptre_of_Fire/images/units/dwarves/caravan.png
    M data/campaigns/Sceptre_of_Fire/units/Caravan.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_The_Rise_of_Wesnoth.cfg
    M data/campaigns/The_South_Guard/units/Infantry_Commander.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg
    M data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
    M data/core/about.cfg
    M data/core/macros/image-utils.cfg
    M data/core/macros/terrain-utils.cfg
    M data/core/macros/utils.cfg
    A data/core/music/frantic-old.ogg
    M data/core/music/frantic.ogg
    M data/core/units/humans/Mage_Elder.cfg
    M data/core/units/khalifate/Ghazi.cfg
    M data/core/units/khalifate/Hakim.cfg
    M data/core/units/khalifate/Mudafi.cfg
    M data/core/units/khalifate/Saree.cfg
    M data/core/units/khalifate/Shuja.cfg
    M data/core/units/orcs/Nightblade.cfg
    M data/gui/default/widget/button_25x25.cfg
    M data/gui/default/widget/button_default.cfg
    M data/gui/default/widget/horizontal_scrollbar_default.cfg
    M data/gui/default/widget/repeating_button_default.cfg
    M data/gui/default/widget/slider_default.cfg
    M data/gui/default/widget/slider_minimal.cfg
    M data/gui/default/widget/text_box_default.cfg
    M data/gui/default/widget/toggle_button_default.cfg
    M data/gui/default/widget/toggle_button_icon.cfg
    M data/gui/default/widget/toggle_button_listbox_header.cfg
    M data/gui/default/widget/toggle_button_listbox_text.cfg
    M data/gui/default/widget/toggle_button_listbox_text_with_icon.cfg
    M data/gui/default/widget/toggle_button_radio.cfg
    M data/gui/default/widget/toggle_button_tree_view_node.cfg
    M data/gui/default/widget/toggle_panel_default.cfg
    M data/gui/default/widget/toggle_panel_wml_message.cfg
    M data/gui/default/widget/vertical_scrollbar_default.cfg
    M data/gui/default/window/debug_clock.cfg
    M data/gui/default/window/game_load.cfg
    M data/gui/default/window/lobby_main.cfg
    M data/gui/schema.cfg
    M data/lua/wml-tags.lua
    M data/scenario-test.cfg
    M data/test/maps/pathfind_1.cfg
    M data/test/scenarios/filter_vision.cfg
    M data/test/scenarios/has_ally.cfg
    M data/test/scenarios/move_skip_sighted.cfg
    M data/test/scenarios/test_check_victory.cfg
    M data/test/scenarios/test_lua.cfg
    M data/test/scenarios/test_move.cfg
    M data/tools/Makefile
    M doc/man/cs/wesnoth.6
    M doc/man/de/wesnoth.6
    M doc/man/en_GB/wesnoth.6
    M doc/man/en_GB/wesnothd.6
    M doc/man/es/wesnoth.6
    M doc/man/et/wesnoth.6
    M doc/man/fi/wesnoth.6
    M doc/man/fr/wesnoth.6
    M doc/man/gl/wesnoth.6
    M doc/man/hu/wesnoth.6
    M doc/man/id/wesnoth.6
    M doc/man/it/wesnoth.6
    M doc/man/pl/wesnoth.6
    M doc/man/pt/wesnoth.6
    M doc/man/ru/wesnoth.6
    M doc/man/sk/wesnoth.6
    M doc/man/sr/wesnoth.6
    M doc/man/sr at ijekavian/wesnoth.6
    M doc/man/sr at ijekavianlatin/wesnoth.6
    M doc/man/sr at latin/wesnoth.6
    M doc/man/uk/wesnoth.6
    M doc/man/vi/wesnoth.6
    M doc/man/wesnoth.6
    M doc/man/zh_CN/wesnoth.6
    M doc/manual/manual.cs.html
    M doc/manual/manual.de.html
    M doc/manual/manual.en.html
    M doc/manual/manual.en_GB.html
    M doc/manual/manual.es.html
    M doc/manual/manual.et.html
    M doc/manual/manual.fi.html
    M doc/manual/manual.fr.html
    M doc/manual/manual.gl.html
    M doc/manual/manual.hu.html
    M doc/manual/manual.id.html
    M doc/manual/manual.it.html
    M doc/manual/manual.ja.html
    M doc/manual/manual.pl.html
    M doc/manual/manual.pt.html
    M doc/manual/manual.pt_BR.html
    M doc/manual/manual.ru.html
    M doc/manual/manual.sk.html
    M doc/manual/manual.sr.html
    M doc/manual/manual.sr at ijekavian.html
    M doc/manual/manual.sr at ijekavianlatin.html
    M doc/manual/manual.sr at latin.html
    M doc/manual/manual.uk.html
    M doc/manual/manual.vi.html
    M doc/manual/manual.zh_CN.html
    M doc/manual/manual.zh_TW.html
    M packaging/windows/WindowsInstallerGraphic.bmp
    M players_changelog
    R po/wesnoth-ai/POTFILES.in
    M po/wesnoth-ai/af.po
    M po/wesnoth-ai/ang.po
    M po/wesnoth-ai/ang at latin.po
    M po/wesnoth-ai/ar.po
    M po/wesnoth-ai/bg.po
    M po/wesnoth-ai/ca.po
    M po/wesnoth-ai/ca_ES at valencia.po
    M po/wesnoth-ai/cs.po
    M po/wesnoth-ai/da.po
    M po/wesnoth-ai/de.po
    M po/wesnoth-ai/el.po
    M po/wesnoth-ai/en at shaw.po
    M po/wesnoth-ai/en_GB.po
    M po/wesnoth-ai/eo.po
    M po/wesnoth-ai/es.po
    M po/wesnoth-ai/et.po
    M po/wesnoth-ai/eu.po
    M po/wesnoth-ai/fi.po
    M po/wesnoth-ai/fr.po
    M po/wesnoth-ai/fur_IT.po
    M po/wesnoth-ai/ga.po
    M po/wesnoth-ai/gd.po
    M po/wesnoth-ai/gl.po
    M po/wesnoth-ai/he.po
    M po/wesnoth-ai/hr.po
    M po/wesnoth-ai/hu.po
    M po/wesnoth-ai/id.po
    M po/wesnoth-ai/is.po
    M po/wesnoth-ai/it.po
    M po/wesnoth-ai/ja.po
    M po/wesnoth-ai/ko.po
    M po/wesnoth-ai/la.po
    M po/wesnoth-ai/lt.po
    M po/wesnoth-ai/lv.po
    M po/wesnoth-ai/mk.po
    M po/wesnoth-ai/mr.po
    M po/wesnoth-ai/nb_NO.po
    M po/wesnoth-ai/nl.po
    M po/wesnoth-ai/pl.po
    M po/wesnoth-ai/pt.po
    M po/wesnoth-ai/pt_BR.po
    M po/wesnoth-ai/racv.po
    M po/wesnoth-ai/ro.po
    M po/wesnoth-ai/ru.po
    M po/wesnoth-ai/sk.po
    M po/wesnoth-ai/sl.po
    M po/wesnoth-ai/sr.po
    M po/wesnoth-ai/sr at ijekavian.po
    M po/wesnoth-ai/sr at ijekavianlatin.po
    M po/wesnoth-ai/sr at latin.po
    M po/wesnoth-ai/sv.po
    M po/wesnoth-ai/tl.po
    M po/wesnoth-ai/tr.po
    M po/wesnoth-ai/uk.po
    M po/wesnoth-ai/vi.po
    M po/wesnoth-ai/wesnoth-ai.pot
    M po/wesnoth-ai/zh_CN.po
    M po/wesnoth-ai/zh_TW.po
    R po/wesnoth-anl/POTFILES.in
    M po/wesnoth-anl/wesnoth-anl.pot
    R po/wesnoth-aoi/POTFILES.in
    M po/wesnoth-aoi/af.po
    M po/wesnoth-aoi/ang.po
    M po/wesnoth-aoi/ang at latin.po
    M po/wesnoth-aoi/ar.po
    M po/wesnoth-aoi/bg.po
    M po/wesnoth-aoi/ca.po
    M po/wesnoth-aoi/ca_ES at valencia.po
    M po/wesnoth-aoi/cs.po
    M po/wesnoth-aoi/da.po
    M po/wesnoth-aoi/de.po
    M po/wesnoth-aoi/el.po
    M po/wesnoth-aoi/en at shaw.po
    M po/wesnoth-aoi/en_GB.po
    M po/wesnoth-aoi/eo.po
    M po/wesnoth-aoi/es.po
    M po/wesnoth-aoi/et.po
    M po/wesnoth-aoi/eu.po
    M po/wesnoth-aoi/fi.po
    M po/wesnoth-aoi/fr.po
    M po/wesnoth-aoi/fur_IT.po
    M po/wesnoth-aoi/ga.po
    M po/wesnoth-aoi/gd.po
    M po/wesnoth-aoi/gl.po
    M po/wesnoth-aoi/he.po
    M po/wesnoth-aoi/hr.po
    M po/wesnoth-aoi/hu.po
    M po/wesnoth-aoi/id.po
    M po/wesnoth-aoi/is.po
    M po/wesnoth-aoi/it.po
    M po/wesnoth-aoi/ja.po
    M po/wesnoth-aoi/ko.po
    M po/wesnoth-aoi/la.po
    M po/wesnoth-aoi/lt.po
    M po/wesnoth-aoi/lv.po
    M po/wesnoth-aoi/mk.po
    M po/wesnoth-aoi/mr.po
    M po/wesnoth-aoi/nb_NO.po
    M po/wesnoth-aoi/nl.po
    M po/wesnoth-aoi/pl.po
    M po/wesnoth-aoi/pt.po
    M po/wesnoth-aoi/pt_BR.po
    M po/wesnoth-aoi/racv.po
    M po/wesnoth-aoi/ro.po
    M po/wesnoth-aoi/ru.po
    M po/wesnoth-aoi/sk.po
    M po/wesnoth-aoi/sl.po
    M po/wesnoth-aoi/sr.po
    M po/wesnoth-aoi/sr at ijekavian.po
    M po/wesnoth-aoi/sr at ijekavianlatin.po
    M po/wesnoth-aoi/sr at latin.po
    M po/wesnoth-aoi/sv.po
    M po/wesnoth-aoi/tl.po
    M po/wesnoth-aoi/tr.po
    M po/wesnoth-aoi/uk.po
    M po/wesnoth-aoi/vi.po
    M po/wesnoth-aoi/wesnoth-aoi.pot
    M po/wesnoth-aoi/zh_CN.po
    M po/wesnoth-aoi/zh_TW.po
    R po/wesnoth-did/POTFILES.in
    M po/wesnoth-did/af.po
    M po/wesnoth-did/ang.po
    M po/wesnoth-did/ang at latin.po
    M po/wesnoth-did/ar.po
    M po/wesnoth-did/bg.po
    M po/wesnoth-did/ca.po
    M po/wesnoth-did/ca_ES at valencia.po
    M po/wesnoth-did/cs.po
    M po/wesnoth-did/da.po
    M po/wesnoth-did/de.po
    M po/wesnoth-did/el.po
    M po/wesnoth-did/en at shaw.po
    M po/wesnoth-did/en_GB.po
    M po/wesnoth-did/eo.po
    M po/wesnoth-did/es.po
    M po/wesnoth-did/et.po
    M po/wesnoth-did/eu.po
    M po/wesnoth-did/fi.po
    M po/wesnoth-did/fr.po
    M po/wesnoth-did/fur_IT.po
    M po/wesnoth-did/ga.po
    M po/wesnoth-did/gd.po
    M po/wesnoth-did/gl.po
    M po/wesnoth-did/he.po
    M po/wesnoth-did/hr.po
    M po/wesnoth-did/hu.po
    M po/wesnoth-did/id.po
    M po/wesnoth-did/is.po
    M po/wesnoth-did/it.po
    M po/wesnoth-did/ja.po
    M po/wesnoth-did/ko.po
    M po/wesnoth-did/la.po
    M po/wesnoth-did/lt.po
    M po/wesnoth-did/lv.po
    M po/wesnoth-did/mk.po
    M po/wesnoth-did/mr.po
    M po/wesnoth-did/nb_NO.po
    M po/wesnoth-did/nl.po
    M po/wesnoth-did/pl.po
    M po/wesnoth-did/pt.po
    M po/wesnoth-did/pt_BR.po
    M po/wesnoth-did/racv.po
    M po/wesnoth-did/ro.po
    M po/wesnoth-did/ru.po
    M po/wesnoth-did/sk.po
    M po/wesnoth-did/sl.po
    M po/wesnoth-did/sr.po
    M po/wesnoth-did/sr at ijekavian.po
    M po/wesnoth-did/sr at ijekavianlatin.po
    M po/wesnoth-did/sr at latin.po
    M po/wesnoth-did/sv.po
    M po/wesnoth-did/tl.po
    M po/wesnoth-did/tr.po
    M po/wesnoth-did/uk.po
    M po/wesnoth-did/vi.po
    M po/wesnoth-did/wesnoth-did.pot
    M po/wesnoth-did/zh_CN.po
    M po/wesnoth-did/zh_TW.po
    R po/wesnoth-dm/POTFILES.in
    M po/wesnoth-dm/af.po
    M po/wesnoth-dm/ang.po
    M po/wesnoth-dm/ang at latin.po
    M po/wesnoth-dm/ar.po
    M po/wesnoth-dm/bg.po
    M po/wesnoth-dm/ca.po
    M po/wesnoth-dm/ca_ES at valencia.po
    M po/wesnoth-dm/cs.po
    M po/wesnoth-dm/da.po
    M po/wesnoth-dm/de.po
    M po/wesnoth-dm/el.po
    M po/wesnoth-dm/en at shaw.po
    M po/wesnoth-dm/en_GB.po
    M po/wesnoth-dm/eo.po
    M po/wesnoth-dm/es.po
    M po/wesnoth-dm/et.po
    M po/wesnoth-dm/eu.po
    M po/wesnoth-dm/fi.po
    M po/wesnoth-dm/fr.po
    M po/wesnoth-dm/fur_IT.po
    M po/wesnoth-dm/ga.po
    M po/wesnoth-dm/gd.po
    M po/wesnoth-dm/gl.po
    M po/wesnoth-dm/he.po
    M po/wesnoth-dm/hr.po
    M po/wesnoth-dm/hu.po
    M po/wesnoth-dm/id.po
    M po/wesnoth-dm/is.po
    M po/wesnoth-dm/it.po
    M po/wesnoth-dm/ja.po
    M po/wesnoth-dm/ko.po
    M po/wesnoth-dm/la.po
    M po/wesnoth-dm/lt.po
    M po/wesnoth-dm/lv.po
    M po/wesnoth-dm/mk.po
    M po/wesnoth-dm/mr.po
    M po/wesnoth-dm/nb_NO.po
    M po/wesnoth-dm/nl.po
    M po/wesnoth-dm/pl.po
    M po/wesnoth-dm/pt.po
    M po/wesnoth-dm/pt_BR.po
    M po/wesnoth-dm/racv.po
    M po/wesnoth-dm/ro.po
    M po/wesnoth-dm/ru.po
    M po/wesnoth-dm/sk.po
    M po/wesnoth-dm/sl.po
    M po/wesnoth-dm/sr.po
    M po/wesnoth-dm/sr at ijekavian.po
    M po/wesnoth-dm/sr at ijekavianlatin.po
    M po/wesnoth-dm/sr at latin.po
    M po/wesnoth-dm/sv.po
    M po/wesnoth-dm/tl.po
    M po/wesnoth-dm/tr.po
    M po/wesnoth-dm/uk.po
    M po/wesnoth-dm/vi.po
    M po/wesnoth-dm/wesnoth-dm.pot
    M po/wesnoth-dm/zh_CN.po
    M po/wesnoth-dm/zh_TW.po
    R po/wesnoth-dw/POTFILES.in
    M po/wesnoth-dw/af.po
    M po/wesnoth-dw/ang.po
    M po/wesnoth-dw/ang at latin.po
    M po/wesnoth-dw/ar.po
    M po/wesnoth-dw/bg.po
    M po/wesnoth-dw/ca.po
    M po/wesnoth-dw/ca_ES at valencia.po
    M po/wesnoth-dw/cs.po
    M po/wesnoth-dw/da.po
    M po/wesnoth-dw/de.po
    M po/wesnoth-dw/el.po
    M po/wesnoth-dw/en at shaw.po
    M po/wesnoth-dw/en_GB.po
    M po/wesnoth-dw/eo.po
    M po/wesnoth-dw/es.po
    M po/wesnoth-dw/et.po
    M po/wesnoth-dw/eu.po
    M po/wesnoth-dw/fi.po
    M po/wesnoth-dw/fr.po
    M po/wesnoth-dw/fur_IT.po
    M po/wesnoth-dw/ga.po
    M po/wesnoth-dw/gd.po
    M po/wesnoth-dw/gl.po
    M po/wesnoth-dw/he.po
    M po/wesnoth-dw/hr.po
    M po/wesnoth-dw/hu.po
    M po/wesnoth-dw/id.po
    M po/wesnoth-dw/is.po
    M po/wesnoth-dw/it.po
    M po/wesnoth-dw/ja.po
    M po/wesnoth-dw/ko.po
    M po/wesnoth-dw/la.po
    M po/wesnoth-dw/lt.po
    M po/wesnoth-dw/lv.po
    M po/wesnoth-dw/mk.po
    M po/wesnoth-dw/mr.po
    M po/wesnoth-dw/nb_NO.po
    M po/wesnoth-dw/nl.po
    M po/wesnoth-dw/pl.po
    M po/wesnoth-dw/pt.po
    M po/wesnoth-dw/pt_BR.po
    M po/wesnoth-dw/racv.po
    M po/wesnoth-dw/ro.po
    M po/wesnoth-dw/ru.po
    M po/wesnoth-dw/sk.po
    M po/wesnoth-dw/sl.po
    M po/wesnoth-dw/sr.po
    M po/wesnoth-dw/sr at ijekavian.po
    M po/wesnoth-dw/sr at ijekavianlatin.po
    M po/wesnoth-dw/sr at latin.po
    M po/wesnoth-dw/sv.po
    M po/wesnoth-dw/tl.po
    M po/wesnoth-dw/tr.po
    M po/wesnoth-dw/uk.po
    M po/wesnoth-dw/vi.po
    M po/wesnoth-dw/wesnoth-dw.pot
    M po/wesnoth-dw/zh_CN.po
    M po/wesnoth-dw/zh_TW.po
    R po/wesnoth-editor/POTFILES.in
    M po/wesnoth-editor/af.po
    M po/wesnoth-editor/ang.po
    M po/wesnoth-editor/ang at latin.po
    M po/wesnoth-editor/ar.po
    M po/wesnoth-editor/bg.po
    M po/wesnoth-editor/ca.po
    M po/wesnoth-editor/ca_ES at valencia.po
    M po/wesnoth-editor/cs.po
    M po/wesnoth-editor/da.po
    M po/wesnoth-editor/de.po
    M po/wesnoth-editor/el.po
    M po/wesnoth-editor/en at shaw.po
    M po/wesnoth-editor/en_GB.po
    M po/wesnoth-editor/eo.po
    M po/wesnoth-editor/es.po
    M po/wesnoth-editor/et.po
    M po/wesnoth-editor/eu.po
    M po/wesnoth-editor/fi.po
    M po/wesnoth-editor/fr.po
    M po/wesnoth-editor/fur_IT.po
    M po/wesnoth-editor/ga.po
    M po/wesnoth-editor/gd.po
    M po/wesnoth-editor/gl.po
    M po/wesnoth-editor/he.po
    M po/wesnoth-editor/hr.po
    M po/wesnoth-editor/hu.po
    M po/wesnoth-editor/id.po
    M po/wesnoth-editor/is.po
    M po/wesnoth-editor/it.po
    M po/wesnoth-editor/ja.po
    M po/wesnoth-editor/ko.po
    M po/wesnoth-editor/la.po
    M po/wesnoth-editor/lt.po
    M po/wesnoth-editor/lv.po
    M po/wesnoth-editor/mk.po
    M po/wesnoth-editor/mr.po
    M po/wesnoth-editor/nb_NO.po
    M po/wesnoth-editor/nl.po
    M po/wesnoth-editor/pl.po
    M po/wesnoth-editor/pt.po
    M po/wesnoth-editor/pt_BR.po
    M po/wesnoth-editor/racv.po
    M po/wesnoth-editor/ro.po
    M po/wesnoth-editor/ru.po
    M po/wesnoth-editor/sk.po
    M po/wesnoth-editor/sl.po
    M po/wesnoth-editor/sr.po
    M po/wesnoth-editor/sr at ijekavian.po
    M po/wesnoth-editor/sr at ijekavianlatin.po
    M po/wesnoth-editor/sr at latin.po
    M po/wesnoth-editor/sv.po
    M po/wesnoth-editor/tl.po
    M po/wesnoth-editor/tr.po
    M po/wesnoth-editor/uk.po
    M po/wesnoth-editor/vi.po
    M po/wesnoth-editor/wesnoth-editor.pot
    M po/wesnoth-editor/zh_CN.po
    M po/wesnoth-editor/zh_TW.po
    R po/wesnoth-ei/POTFILES.in
    M po/wesnoth-ei/af.po
    M po/wesnoth-ei/ang.po
    M po/wesnoth-ei/ang at latin.po
    M po/wesnoth-ei/ar.po
    M po/wesnoth-ei/bg.po
    M po/wesnoth-ei/ca.po
    M po/wesnoth-ei/ca_ES at valencia.po
    M po/wesnoth-ei/cs.po
    M po/wesnoth-ei/da.po
    M po/wesnoth-ei/de.po
    M po/wesnoth-ei/el.po
    M po/wesnoth-ei/en at shaw.po
    M po/wesnoth-ei/en_GB.po
    M po/wesnoth-ei/eo.po
    M po/wesnoth-ei/es.po
    M po/wesnoth-ei/et.po
    M po/wesnoth-ei/eu.po
    M po/wesnoth-ei/fi.po
    M po/wesnoth-ei/fr.po
    M po/wesnoth-ei/fur_IT.po
    M po/wesnoth-ei/ga.po
    M po/wesnoth-ei/gd.po
    M po/wesnoth-ei/gl.po
    M po/wesnoth-ei/he.po
    M po/wesnoth-ei/hr.po
    M po/wesnoth-ei/hu.po
    M po/wesnoth-ei/id.po
    M po/wesnoth-ei/is.po
    M po/wesnoth-ei/it.po
    M po/wesnoth-ei/ja.po
    M po/wesnoth-ei/ko.po
    M po/wesnoth-ei/la.po
    M po/wesnoth-ei/lt.po
    M po/wesnoth-ei/lv.po
    M po/wesnoth-ei/mk.po
    M po/wesnoth-ei/mr.po
    M po/wesnoth-ei/nb_NO.po
    M po/wesnoth-ei/nl.po
    M po/wesnoth-ei/pl.po
    M po/wesnoth-ei/pt.po
    M po/wesnoth-ei/pt_BR.po
    M po/wesnoth-ei/racv.po
    M po/wesnoth-ei/ro.po
    M po/wesnoth-ei/ru.po
    M po/wesnoth-ei/sk.po
    M po/wesnoth-ei/sl.po
    M po/wesnoth-ei/sr.po
    M po/wesnoth-ei/sr at ijekavian.po
    M po/wesnoth-ei/sr at ijekavianlatin.po
    M po/wesnoth-ei/sr at latin.po
    M po/wesnoth-ei/sv.po
    M po/wesnoth-ei/tl.po
    M po/wesnoth-ei/tr.po
    M po/wesnoth-ei/uk.po
    M po/wesnoth-ei/vi.po
    M po/wesnoth-ei/wesnoth-ei.pot
    M po/wesnoth-ei/zh_CN.po
    M po/wesnoth-ei/zh_TW.po
    R po/wesnoth-help/POTFILES.in
    M po/wesnoth-help/af.po
    M po/wesnoth-help/ang.po
    M po/wesnoth-help/ang at latin.po
    M po/wesnoth-help/ar.po
    M po/wesnoth-help/bg.po
    M po/wesnoth-help/ca.po
    M po/wesnoth-help/ca_ES at valencia.po
    M po/wesnoth-help/cs.po
    M po/wesnoth-help/da.po
    M po/wesnoth-help/de.po
    M po/wesnoth-help/el.po
    M po/wesnoth-help/en at shaw.po
    M po/wesnoth-help/en_GB.po
    M po/wesnoth-help/eo.po
    M po/wesnoth-help/es.po
    M po/wesnoth-help/et.po
    M po/wesnoth-help/eu.po
    M po/wesnoth-help/fi.po
    M po/wesnoth-help/fr.po
    M po/wesnoth-help/fur_IT.po
    M po/wesnoth-help/ga.po
    M po/wesnoth-help/gd.po
    M po/wesnoth-help/gl.po
    M po/wesnoth-help/he.po
    M po/wesnoth-help/hr.po
    M po/wesnoth-help/hu.po
    M po/wesnoth-help/id.po
    M po/wesnoth-help/is.po
    M po/wesnoth-help/it.po
    M po/wesnoth-help/ja.po
    M po/wesnoth-help/ko.po
    M po/wesnoth-help/la.po
    M po/wesnoth-help/lt.po
    M po/wesnoth-help/lv.po
    M po/wesnoth-help/mk.po
    M po/wesnoth-help/mr.po
    M po/wesnoth-help/nb_NO.po
    M po/wesnoth-help/nl.po
    M po/wesnoth-help/pl.po
    M po/wesnoth-help/pt.po
    M po/wesnoth-help/pt_BR.po
    M po/wesnoth-help/racv.po
    M po/wesnoth-help/ro.po
    M po/wesnoth-help/ru.po
    M po/wesnoth-help/sk.po
    M po/wesnoth-help/sl.po
    M po/wesnoth-help/sr.po
    M po/wesnoth-help/sr at ijekavian.po
    M po/wesnoth-help/sr at ijekavianlatin.po
    M po/wesnoth-help/sr at latin.po
    M po/wesnoth-help/sv.po
    M po/wesnoth-help/tl.po
    M po/wesnoth-help/tr.po
    M po/wesnoth-help/uk.po
    M po/wesnoth-help/vi.po
    M po/wesnoth-help/wesnoth-help.pot
    M po/wesnoth-help/zh_CN.po
    M po/wesnoth-help/zh_TW.po
    R po/wesnoth-httt/POTFILES.in
    M po/wesnoth-httt/af.po
    M po/wesnoth-httt/ang.po
    M po/wesnoth-httt/ang at latin.po
    M po/wesnoth-httt/ar.po
    M po/wesnoth-httt/bg.po
    M po/wesnoth-httt/ca.po
    M po/wesnoth-httt/ca_ES at valencia.po
    M po/wesnoth-httt/cs.po
    M po/wesnoth-httt/da.po
    M po/wesnoth-httt/de.po
    M po/wesnoth-httt/el.po
    M po/wesnoth-httt/en at shaw.po
    M po/wesnoth-httt/en_GB.po
    M po/wesnoth-httt/eo.po
    M po/wesnoth-httt/es.po
    M po/wesnoth-httt/et.po
    M po/wesnoth-httt/eu.po
    M po/wesnoth-httt/fi.po
    M po/wesnoth-httt/fr.po
    M po/wesnoth-httt/fur_IT.po
    M po/wesnoth-httt/ga.po
    M po/wesnoth-httt/gd.po
    M po/wesnoth-httt/gl.po
    M po/wesnoth-httt/he.po
    M po/wesnoth-httt/hr.po
    M po/wesnoth-httt/hu.po
    M po/wesnoth-httt/id.po
    M po/wesnoth-httt/is.po
    M po/wesnoth-httt/it.po
    M po/wesnoth-httt/ja.po
    M po/wesnoth-httt/ko.po
    M po/wesnoth-httt/la.po
    M po/wesnoth-httt/lt.po
    M po/wesnoth-httt/lv.po
    M po/wesnoth-httt/mk.po
    M po/wesnoth-httt/mr.po
    M po/wesnoth-httt/nb_NO.po
    M po/wesnoth-httt/nl.po
    M po/wesnoth-httt/pl.po
    M po/wesnoth-httt/pt.po
    M po/wesnoth-httt/pt_BR.po
    M po/wesnoth-httt/racv.po
    M po/wesnoth-httt/ro.po
    M po/wesnoth-httt/ru.po
    M po/wesnoth-httt/sk.po
    M po/wesnoth-httt/sl.po
    M po/wesnoth-httt/sr.po
    M po/wesnoth-httt/sr at ijekavian.po
    M po/wesnoth-httt/sr at ijekavianlatin.po
    M po/wesnoth-httt/sr at latin.po
    M po/wesnoth-httt/sv.po
    M po/wesnoth-httt/tl.po
    M po/wesnoth-httt/tr.po
    M po/wesnoth-httt/uk.po
    M po/wesnoth-httt/vi.po
    M po/wesnoth-httt/wesnoth-httt.pot
    M po/wesnoth-httt/zh_CN.po
    M po/wesnoth-httt/zh_TW.po
    R po/wesnoth-l/POTFILES.in
    M po/wesnoth-l/af.po
    M po/wesnoth-l/ang.po
    M po/wesnoth-l/ang at latin.po
    M po/wesnoth-l/ar.po
    M po/wesnoth-l/bg.po
    M po/wesnoth-l/ca.po
    M po/wesnoth-l/ca_ES at valencia.po
    M po/wesnoth-l/cs.po
    M po/wesnoth-l/da.po
    M po/wesnoth-l/de.po
    M po/wesnoth-l/el.po
    M po/wesnoth-l/en at shaw.po
    M po/wesnoth-l/en_GB.po
    M po/wesnoth-l/eo.po
    M po/wesnoth-l/es.po
    M po/wesnoth-l/et.po
    M po/wesnoth-l/eu.po
    M po/wesnoth-l/fi.po
    M po/wesnoth-l/fr.po
    M po/wesnoth-l/fur_IT.po
    M po/wesnoth-l/ga.po
    M po/wesnoth-l/gd.po
    M po/wesnoth-l/gl.po
    M po/wesnoth-l/he.po
    M po/wesnoth-l/hr.po
    M po/wesnoth-l/hu.po
    M po/wesnoth-l/id.po
    M po/wesnoth-l/is.po
    M po/wesnoth-l/it.po
    M po/wesnoth-l/ja.po
    M po/wesnoth-l/ko.po
    M po/wesnoth-l/la.po
    M po/wesnoth-l/lt.po
    M po/wesnoth-l/lv.po
    M po/wesnoth-l/mk.po
    M po/wesnoth-l/mr.po
    M po/wesnoth-l/nb_NO.po
    M po/wesnoth-l/nl.po
    M po/wesnoth-l/pl.po
    M po/wesnoth-l/pt.po
    M po/wesnoth-l/pt_BR.po
    M po/wesnoth-l/racv.po
    M po/wesnoth-l/ro.po
    M po/wesnoth-l/ru.po
    M po/wesnoth-l/sk.po
    M po/wesnoth-l/sl.po
    M po/wesnoth-l/sr.po
    M po/wesnoth-l/sr at ijekavian.po
    M po/wesnoth-l/sr at ijekavianlatin.po
    M po/wesnoth-l/sr at latin.po
    M po/wesnoth-l/sv.po
    M po/wesnoth-l/tl.po
    M po/wesnoth-l/tr.po
    M po/wesnoth-l/uk.po
    M po/wesnoth-l/vi.po
    M po/wesnoth-l/wesnoth-l.pot
    M po/wesnoth-l/zh_CN.po
    M po/wesnoth-l/zh_TW.po
    R po/wesnoth-lib/POTFILES.in
    M po/wesnoth-lib/af.po
    M po/wesnoth-lib/ang.po
    M po/wesnoth-lib/ang at latin.po
    M po/wesnoth-lib/ar.po
    M po/wesnoth-lib/bg.po
    M po/wesnoth-lib/ca.po
    M po/wesnoth-lib/ca_ES at valencia.po
    M po/wesnoth-lib/cs.po
    M po/wesnoth-lib/da.po
    M po/wesnoth-lib/de.po
    M po/wesnoth-lib/el.po
    M po/wesnoth-lib/en at shaw.po
    M po/wesnoth-lib/en_GB.po
    M po/wesnoth-lib/eo.po
    M po/wesnoth-lib/es.po
    M po/wesnoth-lib/et.po
    M po/wesnoth-lib/eu.po
    M po/wesnoth-lib/fi.po
    M po/wesnoth-lib/fr.po
    M po/wesnoth-lib/fur_IT.po
    M po/wesnoth-lib/ga.po
    M po/wesnoth-lib/gd.po
    M po/wesnoth-lib/gl.po
    M po/wesnoth-lib/he.po
    M po/wesnoth-lib/hr.po
    M po/wesnoth-lib/hu.po
    M po/wesnoth-lib/id.po
    M po/wesnoth-lib/is.po
    M po/wesnoth-lib/it.po
    M po/wesnoth-lib/ja.po
    M po/wesnoth-lib/ko.po
    M po/wesnoth-lib/la.po
    M po/wesnoth-lib/lt.po
    M po/wesnoth-lib/lv.po
    M po/wesnoth-lib/mk.po
    M po/wesnoth-lib/mr.po
    M po/wesnoth-lib/nb_NO.po
    M po/wesnoth-lib/nl.po
    M po/wesnoth-lib/pl.po
    M po/wesnoth-lib/pt.po
    M po/wesnoth-lib/pt_BR.po
    M po/wesnoth-lib/racv.po
    M po/wesnoth-lib/ro.po
    M po/wesnoth-lib/ru.po
    M po/wesnoth-lib/sk.po
    M po/wesnoth-lib/sl.po
    M po/wesnoth-lib/sr.po
    M po/wesnoth-lib/sr at ijekavian.po
    M po/wesnoth-lib/sr at ijekavianlatin.po
    M po/wesnoth-lib/sr at latin.po
    M po/wesnoth-lib/sv.po
    M po/wesnoth-lib/tl.po
    M po/wesnoth-lib/tr.po
    M po/wesnoth-lib/uk.po
    M po/wesnoth-lib/vi.po
    M po/wesnoth-lib/wesnoth-lib.pot
    M po/wesnoth-lib/zh_CN.po
    M po/wesnoth-lib/zh_TW.po
    R po/wesnoth-low/POTFILES.in
    M po/wesnoth-low/af.po
    M po/wesnoth-low/ang.po
    M po/wesnoth-low/ang at latin.po
    M po/wesnoth-low/ar.po
    M po/wesnoth-low/bg.po
    M po/wesnoth-low/ca.po
    M po/wesnoth-low/ca_ES at valencia.po
    M po/wesnoth-low/cs.po
    M po/wesnoth-low/da.po
    M po/wesnoth-low/de.po
    M po/wesnoth-low/el.po
    M po/wesnoth-low/en at shaw.po
    M po/wesnoth-low/en_GB.po
    M po/wesnoth-low/eo.po
    M po/wesnoth-low/es.po
    M po/wesnoth-low/et.po
    M po/wesnoth-low/eu.po
    M po/wesnoth-low/fi.po
    M po/wesnoth-low/fr.po
    M po/wesnoth-low/fur_IT.po
    M po/wesnoth-low/ga.po
    M po/wesnoth-low/gd.po
    M po/wesnoth-low/gl.po
    M po/wesnoth-low/he.po
    M po/wesnoth-low/hr.po
    M po/wesnoth-low/hu.po
    M po/wesnoth-low/id.po
    M po/wesnoth-low/is.po
    M po/wesnoth-low/it.po
    M po/wesnoth-low/ja.po
    M po/wesnoth-low/ko.po
    M po/wesnoth-low/la.po
    M po/wesnoth-low/lt.po
    M po/wesnoth-low/lv.po
    M po/wesnoth-low/mk.po
    M po/wesnoth-low/mr.po
    M po/wesnoth-low/nb_NO.po
    M po/wesnoth-low/nl.po
    M po/wesnoth-low/pl.po
    M po/wesnoth-low/pt.po
    M po/wesnoth-low/pt_BR.po
    M po/wesnoth-low/racv.po
    M po/wesnoth-low/ro.po
    M po/wesnoth-low/ru.po
    M po/wesnoth-low/sk.po
    M po/wesnoth-low/sl.po
    M po/wesnoth-low/sr.po
    M po/wesnoth-low/sr at ijekavian.po
    M po/wesnoth-low/sr at ijekavianlatin.po
    M po/wesnoth-low/sr at latin.po
    M po/wesnoth-low/sv.po
    M po/wesnoth-low/tl.po
    M po/wesnoth-low/tr.po
    M po/wesnoth-low/uk.po
    M po/wesnoth-low/vi.po
    M po/wesnoth-low/wesnoth-low.pot
    M po/wesnoth-low/zh_CN.po
    M po/wesnoth-low/zh_TW.po
    M po/wesnoth-manpages/af.po
    M po/wesnoth-manpages/ang.po
    M po/wesnoth-manpages/ang at latin.po
    M po/wesnoth-manpages/ar.po
    M po/wesnoth-manpages/bg.po
    M po/wesnoth-manpages/ca.po
    M po/wesnoth-manpages/ca_ES at valencia.po
    M po/wesnoth-manpages/cs.po
    M po/wesnoth-manpages/da.po
    M po/wesnoth-manpages/de.po
    M po/wesnoth-manpages/el.po
    M po/wesnoth-manpages/en at shaw.po
    M po/wesnoth-manpages/en_GB.po
    M po/wesnoth-manpages/eo.po
    M po/wesnoth-manpages/es.po
    M po/wesnoth-manpages/et.po
    M po/wesnoth-manpages/eu.po
    M po/wesnoth-manpages/fi.po
    M po/wesnoth-manpages/fr.po
    M po/wesnoth-manpages/fur_IT.po
    M po/wesnoth-manpages/ga.po
    M po/wesnoth-manpages/gd.po
    M po/wesnoth-manpages/gl.po
    M po/wesnoth-manpages/he.po
    M po/wesnoth-manpages/hr.po
    M po/wesnoth-manpages/hu.po
    M po/wesnoth-manpages/id.po
    M po/wesnoth-manpages/it.po
    M po/wesnoth-manpages/ja.po
    M po/wesnoth-manpages/ko.po
    M po/wesnoth-manpages/la.po
    M po/wesnoth-manpages/lt.po
    M po/wesnoth-manpages/lv.po
    M po/wesnoth-manpages/mk.po
    M po/wesnoth-manpages/mr.po
    M po/wesnoth-manpages/nb_NO.po
    M po/wesnoth-manpages/nl.po
    M po/wesnoth-manpages/pl.po
    M po/wesnoth-manpages/pt.po
    M po/wesnoth-manpages/pt_BR.po
    M po/wesnoth-manpages/racv.po
    M po/wesnoth-manpages/ro.po
    M po/wesnoth-manpages/ru.po
    M po/wesnoth-manpages/sk.po
    M po/wesnoth-manpages/sl.po
    M po/wesnoth-manpages/sr.po
    M po/wesnoth-manpages/sr at ijekavian.po
    M po/wesnoth-manpages/sr at ijekavianlatin.po
    M po/wesnoth-manpages/sr at latin.po
    M po/wesnoth-manpages/sv.po
    M po/wesnoth-manpages/tl.po
    M po/wesnoth-manpages/tr.po
    M po/wesnoth-manpages/uk.po
    M po/wesnoth-manpages/vi.po
    M po/wesnoth-manpages/wesnoth-manpages.pot
    M po/wesnoth-manpages/zh_CN.po
    M po/wesnoth-manpages/zh_TW.po
    M po/wesnoth-manual/wesnoth-manual.pot
    R po/wesnoth-multiplayer/POTFILES.in
    M po/wesnoth-multiplayer/af.po
    M po/wesnoth-multiplayer/ang.po
    M po/wesnoth-multiplayer/ang at latin.po
    M po/wesnoth-multiplayer/ar.po
    M po/wesnoth-multiplayer/bg.po
    M po/wesnoth-multiplayer/ca.po
    M po/wesnoth-multiplayer/ca_ES at valencia.po
    M po/wesnoth-multiplayer/cs.po
    M po/wesnoth-multiplayer/da.po
    M po/wesnoth-multiplayer/de.po
    M po/wesnoth-multiplayer/el.po
    M po/wesnoth-multiplayer/en at shaw.po
    M po/wesnoth-multiplayer/en_GB.po
    M po/wesnoth-multiplayer/eo.po
    M po/wesnoth-multiplayer/es.po
    M po/wesnoth-multiplayer/et.po
    M po/wesnoth-multiplayer/eu.po
    M po/wesnoth-multiplayer/fi.po
    M po/wesnoth-multiplayer/fr.po
    M po/wesnoth-multiplayer/fur_IT.po
    M po/wesnoth-multiplayer/ga.po
    M po/wesnoth-multiplayer/gd.po
    M po/wesnoth-multiplayer/gl.po
    M po/wesnoth-multiplayer/he.po
    M po/wesnoth-multiplayer/hr.po
    M po/wesnoth-multiplayer/hu.po
    M po/wesnoth-multiplayer/id.po
    M po/wesnoth-multiplayer/is.po
    M po/wesnoth-multiplayer/it.po
    M po/wesnoth-multiplayer/ja.po
    M po/wesnoth-multiplayer/ko.po
    M po/wesnoth-multiplayer/la.po
    M po/wesnoth-multiplayer/lt.po
    M po/wesnoth-multiplayer/lv.po
    M po/wesnoth-multiplayer/mk.po
    M po/wesnoth-multiplayer/mr.po
    M po/wesnoth-multiplayer/nb_NO.po
    M po/wesnoth-multiplayer/nl.po
    M po/wesnoth-multiplayer/pl.po
    M po/wesnoth-multiplayer/pt.po
    M po/wesnoth-multiplayer/pt_BR.po
    M po/wesnoth-multiplayer/racv.po
    M po/wesnoth-multiplayer/ro.po
    M po/wesnoth-multiplayer/ru.po
    M po/wesnoth-multiplayer/sk.po
    M po/wesnoth-multiplayer/sl.po
    M po/wesnoth-multiplayer/sr.po
    M po/wesnoth-multiplayer/sr at ijekavian.po
    M po/wesnoth-multiplayer/sr at ijekavianlatin.po
    M po/wesnoth-multiplayer/sr at latin.po
    M po/wesnoth-multiplayer/sv.po
    M po/wesnoth-multiplayer/tl.po
    M po/wesnoth-multiplayer/tr.po
    M po/wesnoth-multiplayer/uk.po
    M po/wesnoth-multiplayer/vi.po
    M po/wesnoth-multiplayer/wesnoth-multiplayer.pot
    M po/wesnoth-multiplayer/zh_CN.po
    M po/wesnoth-multiplayer/zh_TW.po
    R po/wesnoth-nr/POTFILES.in
    M po/wesnoth-nr/af.po
    M po/wesnoth-nr/ang.po
    M po/wesnoth-nr/ang at latin.po
    M po/wesnoth-nr/ar.po
    M po/wesnoth-nr/bg.po
    M po/wesnoth-nr/ca.po
    M po/wesnoth-nr/ca_ES at valencia.po
    M po/wesnoth-nr/cs.po
    M po/wesnoth-nr/da.po
    M po/wesnoth-nr/de.po
    M po/wesnoth-nr/el.po
    M po/wesnoth-nr/en at shaw.po
    M po/wesnoth-nr/en_GB.po
    M po/wesnoth-nr/eo.po
    M po/wesnoth-nr/es.po
    M po/wesnoth-nr/et.po
    M po/wesnoth-nr/eu.po
    M po/wesnoth-nr/fi.po
    M po/wesnoth-nr/fr.po
    M po/wesnoth-nr/fur_IT.po
    M po/wesnoth-nr/ga.po
    M po/wesnoth-nr/gd.po
    M po/wesnoth-nr/gl.po
    M po/wesnoth-nr/he.po
    M po/wesnoth-nr/hr.po
    M po/wesnoth-nr/hu.po
    M po/wesnoth-nr/id.po
    M po/wesnoth-nr/is.po
    M po/wesnoth-nr/it.po
    M po/wesnoth-nr/ja.po
    M po/wesnoth-nr/ko.po
    M po/wesnoth-nr/la.po
    M po/wesnoth-nr/lt.po
    M po/wesnoth-nr/lv.po
    M po/wesnoth-nr/mk.po
    M po/wesnoth-nr/mr.po
    M po/wesnoth-nr/nb_NO.po
    M po/wesnoth-nr/nl.po
    M po/wesnoth-nr/pl.po
    M po/wesnoth-nr/pt.po
    M po/wesnoth-nr/pt_BR.po
    M po/wesnoth-nr/racv.po
    M po/wesnoth-nr/ro.po
    M po/wesnoth-nr/ru.po
    M po/wesnoth-nr/sk.po
    M po/wesnoth-nr/sl.po
    M po/wesnoth-nr/sr.po
    M po/wesnoth-nr/sr at ijekavian.po
    M po/wesnoth-nr/sr at ijekavianlatin.po
    M po/wesnoth-nr/sr at latin.po
    M po/wesnoth-nr/sv.po
    M po/wesnoth-nr/tl.po
    M po/wesnoth-nr/tr.po
    M po/wesnoth-nr/uk.po
    M po/wesnoth-nr/vi.po
    M po/wesnoth-nr/wesnoth-nr.pot
    M po/wesnoth-nr/zh_CN.po
    M po/wesnoth-nr/zh_TW.po
    R po/wesnoth-sof/POTFILES.in
    M po/wesnoth-sof/af.po
    M po/wesnoth-sof/ang.po
    M po/wesnoth-sof/ang at latin.po
    M po/wesnoth-sof/ar.po
    M po/wesnoth-sof/bg.po
    M po/wesnoth-sof/ca.po
    M po/wesnoth-sof/ca_ES at valencia.po
    M po/wesnoth-sof/cs.po
    M po/wesnoth-sof/da.po
    M po/wesnoth-sof/de.po
    M po/wesnoth-sof/el.po
    M po/wesnoth-sof/en at shaw.po
    M po/wesnoth-sof/en_GB.po
    M po/wesnoth-sof/eo.po
    M po/wesnoth-sof/es.po
    M po/wesnoth-sof/et.po
    M po/wesnoth-sof/eu.po
    M po/wesnoth-sof/fi.po
    M po/wesnoth-sof/fr.po
    M po/wesnoth-sof/fur_IT.po
    M po/wesnoth-sof/ga.po
    M po/wesnoth-sof/gd.po
    M po/wesnoth-sof/gl.po
    M po/wesnoth-sof/he.po
    M po/wesnoth-sof/hr.po
    M po/wesnoth-sof/hu.po
    M po/wesnoth-sof/id.po
    M po/wesnoth-sof/is.po
    M po/wesnoth-sof/it.po
    M po/wesnoth-sof/ja.po
    M po/wesnoth-sof/ko.po
    M po/wesnoth-sof/la.po
    M po/wesnoth-sof/lt.po
    M po/wesnoth-sof/lv.po
    M po/wesnoth-sof/mk.po
    M po/wesnoth-sof/mr.po
    M po/wesnoth-sof/nb_NO.po
    M po/wesnoth-sof/nl.po
    M po/wesnoth-sof/pl.po
    M po/wesnoth-sof/pt.po
    M po/wesnoth-sof/pt_BR.po
    M po/wesnoth-sof/racv.po
    M po/wesnoth-sof/ro.po
    M po/wesnoth-sof/ru.po
    M po/wesnoth-sof/sk.po
    M po/wesnoth-sof/sl.po
    M po/wesnoth-sof/sr.po
    M po/wesnoth-sof/sr at ijekavian.po
    M po/wesnoth-sof/sr at ijekavianlatin.po
    M po/wesnoth-sof/sr at latin.po
    M po/wesnoth-sof/sv.po
    M po/wesnoth-sof/tl.po
    M po/wesnoth-sof/tr.po
    M po/wesnoth-sof/uk.po
    M po/wesnoth-sof/vi.po
    M po/wesnoth-sof/wesnoth-sof.pot
    M po/wesnoth-sof/zh_CN.po
    M po/wesnoth-sof/zh_TW.po
    R po/wesnoth-sotbe/POTFILES.in
    M po/wesnoth-sotbe/af.po
    M po/wesnoth-sotbe/ang.po
    M po/wesnoth-sotbe/ang at latin.po
    M po/wesnoth-sotbe/ar.po
    M po/wesnoth-sotbe/bg.po
    M po/wesnoth-sotbe/ca.po
    M po/wesnoth-sotbe/ca_ES at valencia.po
    M po/wesnoth-sotbe/cs.po
    M po/wesnoth-sotbe/da.po
    M po/wesnoth-sotbe/de.po
    M po/wesnoth-sotbe/el.po
    M po/wesnoth-sotbe/en at shaw.po
    M po/wesnoth-sotbe/en_GB.po
    M po/wesnoth-sotbe/eo.po
    M po/wesnoth-sotbe/es.po
    M po/wesnoth-sotbe/et.po
    M po/wesnoth-sotbe/eu.po
    M po/wesnoth-sotbe/fi.po
    M po/wesnoth-sotbe/fr.po
    M po/wesnoth-sotbe/fur_IT.po
    M po/wesnoth-sotbe/ga.po
    M po/wesnoth-sotbe/gd.po
    M po/wesnoth-sotbe/gl.po
    M po/wesnoth-sotbe/he.po
    M po/wesnoth-sotbe/hr.po
    M po/wesnoth-sotbe/hu.po
    M po/wesnoth-sotbe/id.po
    M po/wesnoth-sotbe/is.po
    M po/wesnoth-sotbe/it.po
    M po/wesnoth-sotbe/ja.po
    M po/wesnoth-sotbe/ko.po
    M po/wesnoth-sotbe/la.po
    M po/wesnoth-sotbe/lt.po
    M po/wesnoth-sotbe/lv.po
    M po/wesnoth-sotbe/mk.po
    M po/wesnoth-sotbe/mr.po
    M po/wesnoth-sotbe/nb_NO.po
    M po/wesnoth-sotbe/nl.po
    M po/wesnoth-sotbe/pl.po
    M po/wesnoth-sotbe/pt.po
    M po/wesnoth-sotbe/pt_BR.po
    M po/wesnoth-sotbe/racv.po
    M po/wesnoth-sotbe/ro.po
    M po/wesnoth-sotbe/ru.po
    M po/wesnoth-sotbe/sk.po
    M po/wesnoth-sotbe/sl.po
    M po/wesnoth-sotbe/sr.po
    M po/wesnoth-sotbe/sr at ijekavian.po
    M po/wesnoth-sotbe/sr at ijekavianlatin.po
    M po/wesnoth-sotbe/sr at latin.po
    M po/wesnoth-sotbe/sv.po
    M po/wesnoth-sotbe/tl.po
    M po/wesnoth-sotbe/tr.po
    M po/wesnoth-sotbe/uk.po
    M po/wesnoth-sotbe/vi.po
    M po/wesnoth-sotbe/wesnoth-sotbe.pot
    M po/wesnoth-sotbe/zh_CN.po
    M po/wesnoth-sotbe/zh_TW.po
    R po/wesnoth-tb/POTFILES.in
    M po/wesnoth-tb/af.po
    M po/wesnoth-tb/ang.po
    M po/wesnoth-tb/ang at latin.po
    M po/wesnoth-tb/ar.po
    M po/wesnoth-tb/bg.po
    M po/wesnoth-tb/ca.po
    M po/wesnoth-tb/ca_ES at valencia.po
    M po/wesnoth-tb/cs.po
    M po/wesnoth-tb/da.po
    M po/wesnoth-tb/de.po
    M po/wesnoth-tb/el.po
    M po/wesnoth-tb/en at shaw.po
    M po/wesnoth-tb/en_GB.po
    M po/wesnoth-tb/eo.po
    M po/wesnoth-tb/es.po
    M po/wesnoth-tb/et.po
    M po/wesnoth-tb/eu.po
    M po/wesnoth-tb/fi.po
    M po/wesnoth-tb/fr.po
    M po/wesnoth-tb/fur_IT.po
    M po/wesnoth-tb/ga.po
    M po/wesnoth-tb/gd.po
    M po/wesnoth-tb/gl.po
    M po/wesnoth-tb/he.po
    M po/wesnoth-tb/hr.po
    M po/wesnoth-tb/hu.po
    M po/wesnoth-tb/id.po
    M po/wesnoth-tb/is.po
    M po/wesnoth-tb/it.po
    M po/wesnoth-tb/ja.po
    M po/wesnoth-tb/ko.po
    M po/wesnoth-tb/la.po
    M po/wesnoth-tb/lt.po
    M po/wesnoth-tb/lv.po
    M po/wesnoth-tb/mk.po
    M po/wesnoth-tb/mr.po
    M po/wesnoth-tb/nb_NO.po
    M po/wesnoth-tb/nl.po
    M po/wesnoth-tb/pl.po
    M po/wesnoth-tb/pt.po
    M po/wesnoth-tb/pt_BR.po
    M po/wesnoth-tb/racv.po
    M po/wesnoth-tb/ro.po
    M po/wesnoth-tb/ru.po
    M po/wesnoth-tb/sk.po
    M po/wesnoth-tb/sl.po
    M po/wesnoth-tb/sr.po
    M po/wesnoth-tb/sr at ijekavian.po
    M po/wesnoth-tb/sr at ijekavianlatin.po
    M po/wesnoth-tb/sr at latin.po
    M po/wesnoth-tb/sv.po
    M po/wesnoth-tb/tl.po
    M po/wesnoth-tb/tr.po
    M po/wesnoth-tb/uk.po
    M po/wesnoth-tb/vi.po
    M po/wesnoth-tb/wesnoth-tb.pot
    M po/wesnoth-tb/zh_CN.po
    M po/wesnoth-tb/zh_TW.po
    R po/wesnoth-test/POTFILES.in
    M po/wesnoth-test/wesnoth-test.pot
    R po/wesnoth-thot/POTFILES.in
    M po/wesnoth-thot/af.po
    M po/wesnoth-thot/ang.po
    M po/wesnoth-thot/ang at latin.po
    M po/wesnoth-thot/ar.po
    M po/wesnoth-thot/bg.po
    M po/wesnoth-thot/ca.po
    M po/wesnoth-thot/ca_ES at valencia.po
    M po/wesnoth-thot/cs.po
    M po/wesnoth-thot/da.po
    M po/wesnoth-thot/de.po
    M po/wesnoth-thot/el.po
    M po/wesnoth-thot/en at shaw.po
    M po/wesnoth-thot/en_GB.po
    M po/wesnoth-thot/eo.po
    M po/wesnoth-thot/es.po
    M po/wesnoth-thot/et.po
    M po/wesnoth-thot/eu.po
    M po/wesnoth-thot/fi.po
    M po/wesnoth-thot/fr.po
    M po/wesnoth-thot/fur_IT.po
    M po/wesnoth-thot/ga.po
    M po/wesnoth-thot/gd.po
    M po/wesnoth-thot/gl.po
    M po/wesnoth-thot/he.po
    M po/wesnoth-thot/hr.po
    M po/wesnoth-thot/hu.po
    M po/wesnoth-thot/id.po
    M po/wesnoth-thot/is.po
    M po/wesnoth-thot/it.po
    M po/wesnoth-thot/ja.po
    M po/wesnoth-thot/ko.po
    M po/wesnoth-thot/la.po
    M po/wesnoth-thot/lt.po
    M po/wesnoth-thot/lv.po
    M po/wesnoth-thot/mk.po
    M po/wesnoth-thot/mr.po
    M po/wesnoth-thot/nb_NO.po
    M po/wesnoth-thot/nl.po
    M po/wesnoth-thot/pl.po
    M po/wesnoth-thot/pt.po
    M po/wesnoth-thot/pt_BR.po
    M po/wesnoth-thot/racv.po
    M po/wesnoth-thot/ro.po
    M po/wesnoth-thot/ru.po
    M po/wesnoth-thot/sk.po
    M po/wesnoth-thot/sl.po
    M po/wesnoth-thot/sr.po
    M po/wesnoth-thot/sr at ijekavian.po
    M po/wesnoth-thot/sr at ijekavianlatin.po
    M po/wesnoth-thot/sr at latin.po
    M po/wesnoth-thot/sv.po
    M po/wesnoth-thot/tl.po
    M po/wesnoth-thot/tr.po
    M po/wesnoth-thot/uk.po
    M po/wesnoth-thot/vi.po
    M po/wesnoth-thot/wesnoth-thot.pot
    M po/wesnoth-thot/zh_CN.po
    M po/wesnoth-thot/zh_TW.po
    R po/wesnoth-trow/POTFILES.in
    M po/wesnoth-trow/af.po
    M po/wesnoth-trow/ang.po
    M po/wesnoth-trow/ang at latin.po
    M po/wesnoth-trow/ar.po
    M po/wesnoth-trow/bg.po
    M po/wesnoth-trow/ca.po
    M po/wesnoth-trow/ca_ES at valencia.po
    M po/wesnoth-trow/cs.po
    M po/wesnoth-trow/da.po
    M po/wesnoth-trow/de.po
    M po/wesnoth-trow/el.po
    M po/wesnoth-trow/en at shaw.po
    M po/wesnoth-trow/en_GB.po
    M po/wesnoth-trow/eo.po
    M po/wesnoth-trow/es.po
    M po/wesnoth-trow/et.po
    M po/wesnoth-trow/eu.po
    M po/wesnoth-trow/fi.po
    M po/wesnoth-trow/fr.po
    M po/wesnoth-trow/fur_IT.po
    M po/wesnoth-trow/ga.po
    M po/wesnoth-trow/gd.po
    M po/wesnoth-trow/gl.po
    M po/wesnoth-trow/he.po
    M po/wesnoth-trow/hr.po
    M po/wesnoth-trow/hu.po
    M po/wesnoth-trow/id.po
    M po/wesnoth-trow/is.po
    M po/wesnoth-trow/it.po
    M po/wesnoth-trow/ja.po
    M po/wesnoth-trow/ko.po
    M po/wesnoth-trow/la.po
    M po/wesnoth-trow/lt.po
    M po/wesnoth-trow/lv.po
    M po/wesnoth-trow/mk.po
    M po/wesnoth-trow/mr.po
    M po/wesnoth-trow/nb_NO.po
    M po/wesnoth-trow/nl.po
    M po/wesnoth-trow/pl.po
    M po/wesnoth-trow/pt.po
    M po/wesnoth-trow/pt_BR.po
    M po/wesnoth-trow/racv.po
    M po/wesnoth-trow/ro.po
    M po/wesnoth-trow/ru.po
    M po/wesnoth-trow/sk.po
    M po/wesnoth-trow/sl.po
    M po/wesnoth-trow/sr.po
    M po/wesnoth-trow/sr at ijekavian.po
    M po/wesnoth-trow/sr at ijekavianlatin.po
    M po/wesnoth-trow/sr at latin.po
    M po/wesnoth-trow/sv.po
    M po/wesnoth-trow/tl.po
    M po/wesnoth-trow/tr.po
    M po/wesnoth-trow/uk.po
    M po/wesnoth-trow/vi.po
    M po/wesnoth-trow/wesnoth-trow.pot
    M po/wesnoth-trow/zh_CN.po
    M po/wesnoth-trow/zh_TW.po
    R po/wesnoth-tsg/POTFILES.in
    M po/wesnoth-tsg/af.po
    M po/wesnoth-tsg/ang.po
    M po/wesnoth-tsg/ang at latin.po
    M po/wesnoth-tsg/ar.po
    M po/wesnoth-tsg/bg.po
    M po/wesnoth-tsg/ca.po
    M po/wesnoth-tsg/ca_ES at valencia.po
    M po/wesnoth-tsg/cs.po
    M po/wesnoth-tsg/da.po
    M po/wesnoth-tsg/de.po
    M po/wesnoth-tsg/el.po
    M po/wesnoth-tsg/en at shaw.po
    M po/wesnoth-tsg/en_GB.po
    M po/wesnoth-tsg/eo.po
    M po/wesnoth-tsg/es.po
    M po/wesnoth-tsg/et.po
    M po/wesnoth-tsg/eu.po
    M po/wesnoth-tsg/fi.po
    M po/wesnoth-tsg/fr.po
    M po/wesnoth-tsg/fur_IT.po
    M po/wesnoth-tsg/ga.po
    M po/wesnoth-tsg/gd.po
    M po/wesnoth-tsg/gl.po
    M po/wesnoth-tsg/he.po
    M po/wesnoth-tsg/hr.po
    M po/wesnoth-tsg/hu.po
    M po/wesnoth-tsg/id.po
    M po/wesnoth-tsg/is.po
    M po/wesnoth-tsg/it.po
    M po/wesnoth-tsg/ja.po
    M po/wesnoth-tsg/ko.po
    M po/wesnoth-tsg/la.po
    M po/wesnoth-tsg/lt.po
    M po/wesnoth-tsg/lv.po
    M po/wesnoth-tsg/mk.po
    M po/wesnoth-tsg/mr.po
    M po/wesnoth-tsg/nb_NO.po
    M po/wesnoth-tsg/nl.po
    M po/wesnoth-tsg/pl.po
    M po/wesnoth-tsg/pt.po
    M po/wesnoth-tsg/pt_BR.po
    M po/wesnoth-tsg/racv.po
    M po/wesnoth-tsg/ro.po
    M po/wesnoth-tsg/ru.po
    M po/wesnoth-tsg/sk.po
    M po/wesnoth-tsg/sl.po
    M po/wesnoth-tsg/sr.po
    M po/wesnoth-tsg/sr at ijekavian.po
    M po/wesnoth-tsg/sr at ijekavianlatin.po
    M po/wesnoth-tsg/sr at latin.po
    M po/wesnoth-tsg/sv.po
    M po/wesnoth-tsg/tl.po
    M po/wesnoth-tsg/tr.po
    M po/wesnoth-tsg/uk.po
    M po/wesnoth-tsg/vi.po
    M po/wesnoth-tsg/wesnoth-tsg.pot
    M po/wesnoth-tsg/zh_CN.po
    M po/wesnoth-tsg/zh_TW.po
    R po/wesnoth-tutorial/POTFILES.in
    M po/wesnoth-tutorial/af.po
    M po/wesnoth-tutorial/ang.po
    M po/wesnoth-tutorial/ang at latin.po
    M po/wesnoth-tutorial/ar.po
    M po/wesnoth-tutorial/bg.po
    M po/wesnoth-tutorial/ca.po
    M po/wesnoth-tutorial/ca_ES at valencia.po
    M po/wesnoth-tutorial/cs.po
    M po/wesnoth-tutorial/da.po
    M po/wesnoth-tutorial/de.po
    M po/wesnoth-tutorial/el.po
    M po/wesnoth-tutorial/en at shaw.po
    M po/wesnoth-tutorial/en_GB.po
    M po/wesnoth-tutorial/eo.po
    M po/wesnoth-tutorial/es.po
    M po/wesnoth-tutorial/et.po
    M po/wesnoth-tutorial/eu.po
    M po/wesnoth-tutorial/fi.po
    M po/wesnoth-tutorial/fr.po
    M po/wesnoth-tutorial/fur_IT.po
    M po/wesnoth-tutorial/ga.po
    M po/wesnoth-tutorial/gd.po
    M po/wesnoth-tutorial/gl.po
    M po/wesnoth-tutorial/he.po
    M po/wesnoth-tutorial/hr.po
    M po/wesnoth-tutorial/hu.po
    M po/wesnoth-tutorial/id.po
    M po/wesnoth-tutorial/is.po
    M po/wesnoth-tutorial/it.po
    M po/wesnoth-tutorial/ja.po
    M po/wesnoth-tutorial/ko.po
    M po/wesnoth-tutorial/la.po
    M po/wesnoth-tutorial/lt.po
    M po/wesnoth-tutorial/lv.po
    M po/wesnoth-tutorial/mk.po
    M po/wesnoth-tutorial/mr.po
    M po/wesnoth-tutorial/nb_NO.po
    M po/wesnoth-tutorial/nl.po
    M po/wesnoth-tutorial/pl.po
    M po/wesnoth-tutorial/pt.po
    M po/wesnoth-tutorial/pt_BR.po
    M po/wesnoth-tutorial/racv.po
    M po/wesnoth-tutorial/ro.po
    M po/wesnoth-tutorial/ru.po
    M po/wesnoth-tutorial/sk.po
    M po/wesnoth-tutorial/sl.po
    M po/wesnoth-tutorial/sr.po
    M po/wesnoth-tutorial/sr at ijekavian.po
    M po/wesnoth-tutorial/sr at ijekavianlatin.po
    M po/wesnoth-tutorial/sr at latin.po
    M po/wesnoth-tutorial/sv.po
    M po/wesnoth-tutorial/tl.po
    M po/wesnoth-tutorial/tr.po
    M po/wesnoth-tutorial/uk.po
    M po/wesnoth-tutorial/vi.po
    M po/wesnoth-tutorial/wesnoth-tutorial.pot
    M po/wesnoth-tutorial/zh_CN.po
    M po/wesnoth-tutorial/zh_TW.po
    R po/wesnoth-units/POTFILES.in
    M po/wesnoth-units/af.po
    M po/wesnoth-units/ang.po
    M po/wesnoth-units/ang at latin.po
    M po/wesnoth-units/ar.po
    M po/wesnoth-units/bg.po
    M po/wesnoth-units/ca.po
    M po/wesnoth-units/ca_ES at valencia.po
    M po/wesnoth-units/cs.po
    M po/wesnoth-units/da.po
    M po/wesnoth-units/de.po
    M po/wesnoth-units/el.po
    M po/wesnoth-units/en at shaw.po
    M po/wesnoth-units/en_GB.po
    M po/wesnoth-units/eo.po
    M po/wesnoth-units/es.po
    M po/wesnoth-units/et.po
    M po/wesnoth-units/eu.po
    M po/wesnoth-units/fi.po
    M po/wesnoth-units/fr.po
    M po/wesnoth-units/fur_IT.po
    M po/wesnoth-units/ga.po
    M po/wesnoth-units/gd.po
    M po/wesnoth-units/gl.po
    M po/wesnoth-units/he.po
    M po/wesnoth-units/hr.po
    M po/wesnoth-units/hu.po
    M po/wesnoth-units/id.po
    M po/wesnoth-units/is.po
    M po/wesnoth-units/it.po
    M po/wesnoth-units/ja.po
    M po/wesnoth-units/ko.po
    M po/wesnoth-units/la.po
    M po/wesnoth-units/lt.po
    M po/wesnoth-units/lv.po
    M po/wesnoth-units/mk.po
    M po/wesnoth-units/mr.po
    M po/wesnoth-units/nb_NO.po
    M po/wesnoth-units/nl.po
    M po/wesnoth-units/pl.po
    M po/wesnoth-units/pt.po
    M po/wesnoth-units/pt_BR.po
    M po/wesnoth-units/racv.po
    M po/wesnoth-units/ro.po
    M po/wesnoth-units/ru.po
    M po/wesnoth-units/sk.po
    M po/wesnoth-units/sl.po
    M po/wesnoth-units/sr.po
    M po/wesnoth-units/sr at ijekavian.po
    M po/wesnoth-units/sr at ijekavianlatin.po
    M po/wesnoth-units/sr at latin.po
    M po/wesnoth-units/sv.po
    M po/wesnoth-units/tl.po
    M po/wesnoth-units/tr.po
    M po/wesnoth-units/uk.po
    M po/wesnoth-units/vi.po
    M po/wesnoth-units/wesnoth-units.pot
    M po/wesnoth-units/zh_CN.po
    M po/wesnoth-units/zh_TW.po
    M po/wesnoth-utbs/af.po
    M po/wesnoth-utbs/ang.po
    M po/wesnoth-utbs/ang at latin.po
    M po/wesnoth-utbs/ar.po
    M po/wesnoth-utbs/bg.po
    M po/wesnoth-utbs/ca.po
    M po/wesnoth-utbs/ca_ES at valencia.po
    M po/wesnoth-utbs/cs.po
    M po/wesnoth-utbs/da.po
    M po/wesnoth-utbs/de.po
    M po/wesnoth-utbs/el.po
    M po/wesnoth-utbs/en at shaw.po
    M po/wesnoth-utbs/en_GB.po
    M po/wesnoth-utbs/eo.po
    M po/wesnoth-utbs/es.po
    M po/wesnoth-utbs/et.po
    M po/wesnoth-utbs/eu.po
    M po/wesnoth-utbs/fi.po
    M po/wesnoth-utbs/fr.po
    M po/wesnoth-utbs/fur_IT.po
    M po/wesnoth-utbs/ga.po
    M po/wesnoth-utbs/gd.po
    M po/wesnoth-utbs/gl.po
    M po/wesnoth-utbs/he.po
    M po/wesnoth-utbs/hr.po
    M po/wesnoth-utbs/hu.po
    M po/wesnoth-utbs/id.po
    M po/wesnoth-utbs/is.po
    M po/wesnoth-utbs/it.po
    M po/wesnoth-utbs/ja.po
    M po/wesnoth-utbs/ko.po
    M po/wesnoth-utbs/la.po
    M po/wesnoth-utbs/lt.po
    M po/wesnoth-utbs/lv.po
    M po/wesnoth-utbs/mk.po
    M po/wesnoth-utbs/mr.po
    M po/wesnoth-utbs/nb_NO.po
    M po/wesnoth-utbs/nl.po
    M po/wesnoth-utbs/pl.po
    M po/wesnoth-utbs/pt.po
    M po/wesnoth-utbs/pt_BR.po
    M po/wesnoth-utbs/racv.po
    M po/wesnoth-utbs/ro.po
    M po/wesnoth-utbs/ru.po
    M po/wesnoth-utbs/sk.po
    M po/wesnoth-utbs/sl.po
    M po/wesnoth-utbs/sr.po
    M po/wesnoth-utbs/sr at ijekavian.po
    M po/wesnoth-utbs/sr at ijekavianlatin.po
    M po/wesnoth-utbs/sr at latin.po
    M po/wesnoth-utbs/sv.po
    M po/wesnoth-utbs/tl.po
    M po/wesnoth-utbs/tr.po
    M po/wesnoth-utbs/uk.po
    M po/wesnoth-utbs/vi.po
    M po/wesnoth-utbs/wesnoth-utbs.pot
    M po/wesnoth-utbs/zh_CN.po
    M po/wesnoth-utbs/zh_TW.po
    R po/wesnoth/POTFILES.in
    M po/wesnoth/af.po
    M po/wesnoth/ang.po
    M po/wesnoth/ang at latin.po
    M po/wesnoth/ar.po
    M po/wesnoth/bg.po
    M po/wesnoth/ca.po
    M po/wesnoth/ca_ES at valencia.po
    M po/wesnoth/cs.po
    M po/wesnoth/da.po
    M po/wesnoth/de.po
    M po/wesnoth/el.po
    M po/wesnoth/en at shaw.po
    M po/wesnoth/en_GB.po
    M po/wesnoth/eo.po
    M po/wesnoth/es.po
    M po/wesnoth/et.po
    M po/wesnoth/eu.po
    M po/wesnoth/fi.po
    M po/wesnoth/fr.po
    M po/wesnoth/fur_IT.po
    M po/wesnoth/ga.po
    M po/wesnoth/gd.po
    M po/wesnoth/gl.po
    M po/wesnoth/he.po
    M po/wesnoth/hr.po
    M po/wesnoth/hu.po
    M po/wesnoth/id.po
    M po/wesnoth/is.po
    M po/wesnoth/it.po
    M po/wesnoth/ja.po
    M po/wesnoth/ko.po
    M po/wesnoth/la.po
    M po/wesnoth/lt.po
    M po/wesnoth/lv.po
    M po/wesnoth/mk.po
    M po/wesnoth/mr.po
    M po/wesnoth/nb_NO.po
    M po/wesnoth/nl.po
    M po/wesnoth/pl.po
    M po/wesnoth/pt.po
    M po/wesnoth/pt_BR.po
    M po/wesnoth/racv.po
    M po/wesnoth/ro.po
    M po/wesnoth/ru.po
    M po/wesnoth/sk.po
    M po/wesnoth/sl.po
    M po/wesnoth/sr.po
    M po/wesnoth/sr at ijekavian.po
    M po/wesnoth/sr at ijekavianlatin.po
    M po/wesnoth/sr at latin.po
    M po/wesnoth/sv.po
    M po/wesnoth/tl.po
    M po/wesnoth/tr.po
    M po/wesnoth/uk.po
    M po/wesnoth/vi.po
    M po/wesnoth/wesnoth.pot
    M po/wesnoth/zh_CN.po
    M po/wesnoth/zh_TW.po
    M src/actions/attack.cpp
    M src/ai/default/ai.cpp
    M src/ai/formula/function_table.cpp
    M src/ai/testing.cpp
    M src/ai/testing/ca.cpp
    M src/ai/testing/ca_global_fallback.cpp
    M src/callable_objects.hpp
    M src/dialogs.cpp
    M src/display.cpp
    M src/display.hpp
    M src/display_context.cpp
    M src/editor/action/action_label.cpp
    M src/editor/action/action_label.hpp
    M src/editor/action/mouse/mouse_action_map_label.cpp
    M src/editor/map/context_manager.cpp
    M src/editor/map/map_context.cpp
    M src/formula.cpp
    M src/formula_function.cpp
    M src/game_classification.cpp
    M src/game_config.cpp
    M src/game_config.hpp
    M src/game_display.cpp
    M src/game_display.hpp
    M src/game_events/action_wml.cpp
    M src/game_events/action_wml.hpp
    M src/game_events/handlers.cpp
    M src/game_events/manager.cpp
    M src/game_events/manager.hpp
    M src/game_events/menu_item.cpp
    M src/game_events/menu_item.hpp
    M src/game_events/pump.cpp
    M src/game_events/pump.hpp
    M src/game_events/wmi_container.cpp
    M src/game_events/wmi_container.hpp
    M src/game_initialization/connect_engine.cpp
    M src/game_initialization/connect_engine.hpp
    M src/game_initialization/create_engine.cpp
    M src/game_initialization/flg_manager.cpp
    M src/game_initialization/multiplayer.cpp
    M src/game_initialization/multiplayer_wait.cpp
    M src/game_state.cpp
    M src/game_state.hpp
    M src/gui/auxiliary/widget_definition/button.cpp
    M src/gui/auxiliary/widget_definition/horizontal_scrollbar.cpp
    M src/gui/auxiliary/widget_definition/repeating_button.cpp
    M src/gui/auxiliary/widget_definition/slider.cpp
    M src/gui/auxiliary/widget_definition/text_box.cpp
    M src/gui/auxiliary/widget_definition/toggle_button.cpp
    M src/gui/auxiliary/widget_definition/toggle_panel.cpp
    M src/gui/auxiliary/widget_definition/vertical_scrollbar.cpp
    M src/gui/dialogs/campaign_difficulty.cpp
    M src/gui/dialogs/editor/editor_edit_label.cpp
    M src/gui/dialogs/editor/editor_edit_side.cpp
    M src/gui/dialogs/editor/editor_edit_side.hpp
    M src/gui/dialogs/game_load.cpp
    M src/gui/dialogs/label_settings.cpp
    M src/gui/dialogs/unit_create.cpp
    M src/gui/widgets/button.cpp
    M src/gui/widgets/button.hpp
    M src/gui/widgets/repeating_button.cpp
    M src/gui/widgets/repeating_button.hpp
    M src/gui/widgets/scrollbar.cpp
    M src/gui/widgets/scrollbar.hpp
    M src/gui/widgets/settings.cpp
    M src/gui/widgets/text.cpp
    M src/gui/widgets/text.hpp
    M src/gui/widgets/toggle_button.cpp
    M src/gui/widgets/toggle_button.hpp
    M src/gui/widgets/toggle_panel.cpp
    M src/gui/widgets/toggle_panel.hpp
    M src/gui/widgets/window.cpp
    M src/help/help.cpp
    M src/help/help_text_area.cpp
    M src/help/help_topic_generators.cpp
    M src/leader_scroll_dialog.cpp
    M src/log_windows.cpp
    M src/map_label.cpp
    M src/map_label.hpp
    M src/menu_events.cpp
    M src/overlay.hpp
    M src/play_controller.cpp
    M src/replay.cpp
    M src/replay.hpp
    M src/saved_game.cpp
    M src/saved_game.hpp
    M src/savegame.cpp
    M src/scripting/game_lua_kernel.cpp
    M src/scripting/lua_team.cpp
    M src/sdl/utils.cpp
    M src/sdl/utils.hpp
    M src/server/game.cpp
    M src/server/game.hpp
    M src/side_filter.cpp
    M src/team.cpp
    M src/team.hpp
    M src/tests/test_team.cpp
    M src/unit.cpp
    M src/unit_frame.cpp
    M src/unit_types.cpp
    M src/unit_types.hpp
    M src/wesconfig.h
    M utils/pofix.py

  Log Message:
  -----------
  Merge branch 'master' into sdl2


  Commit: 3f9d9ca3399a26aee4a72a223d234c81f5103b13
      https://github.com/wesnoth/wesnoth/commit/3f9d9ca3399a26aee4a72a223d234c81f5103b13
  Author: Andreas <andreas at alternating.net>
  Date:   2015-12-19 (Sat, 19 Dec 2015)

  Changed paths:
    M .travis.yml
    M CMakeLists.txt
    M SConstruct
    M data/advanced_preferences.cfg
    M data/core/hotkeys.cfg
    M data/themes/classic.cfg
    M data/themes/default.cfg
    M data/themes/editor.cfg
    M data/themes/unit_box.cfg
    M data/themes/widescreen.cfg
    M projectfiles/VC9/WindowsTimeout.vcproj
    M projectfiles/VC9/liblua.vcproj
    M projectfiles/VC9/schema_generator.vcproj
    M projectfiles/VC9/wesnoth.vcproj
    M projectfiles/VC9/wesnothd.vcproj
    M projectfiles/VC9/wesnothlib.vcproj
    M projectfiles/Xcode/Mac Sources/SDLMain.m
    M projectfiles/Xcode/Mac Sources/server_main.m
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
    M src/CMakeLists.txt
    M src/SConscript
    M src/about.cpp
    M src/ai/default/contexts.hpp
    M src/attack_prediction_display.cpp
    M src/controller_base.cpp
    M src/controller_base.hpp
    M src/cursor.cpp
    M src/cursor.hpp
    M src/dialogs.cpp
    M src/display.cpp
    M src/display.hpp
    M src/display_chat_manager.cpp
    M src/editor/controller/editor_controller.cpp
    M src/editor/map/context_manager.cpp
    M src/editor/palette/item_palette.cpp
    M src/editor/palette/unit_palette.cpp
    M src/events.cpp
    M src/events.hpp
    M src/floating_label.cpp
    M src/font.cpp
    M src/font.hpp
    M src/game_initialization/multiplayer.cpp
    M src/game_initialization/multiplayer_configure.cpp
    M src/game_initialization/multiplayer_create.cpp
    M src/game_initialization/multiplayer_wait.cpp
    M src/gui/auxiliary/event/handler.cpp
    M src/gui/dialogs/title_screen.cpp
    M src/gui/widgets/grid.cpp
    M src/gui/widgets/window.cpp
    M src/halo.cpp
    M src/help/help_text_area.cpp
    M src/hotkey/command_executor.cpp
    M src/hotkey/command_executor.hpp
    M src/hotkey/hotkey_command.cpp
    M src/hotkey/hotkey_command.hpp
    M src/hotkey/hotkey_item.cpp
    M src/hotkey/hotkey_item.hpp
    M src/hotkey/hotkey_preferences_display.cpp
    M src/hotkey_handler.cpp
    M src/image_modifications.cpp
    M src/joystick.cpp
    M src/loadscreen.cpp
    M src/marked-up_text.cpp
    M src/marked-up_text.hpp
    M src/minimap.cpp
    M src/playmp_controller.cpp
    M src/preferences_display.cpp
    M src/sdl/alpha.cpp
    A src/sdl/keyboard.cpp
    A src/sdl/keyboard.hpp
    M src/sdl/rect.hpp
    M src/sdl/utils.cpp
    M src/sdl/utils.hpp
    M src/sdl/window.cpp
    M src/server/server.cpp
    M src/storyscreen/render.cpp
    M src/tests/test_image_modifications.cpp
    M src/tools/dummy_video.cpp
    M src/video.cpp
    M src/video.hpp
    M src/wesnoth.cpp
    M src/widgets/file_menu.cpp
    M src/widgets/menu.cpp
    M src/widgets/progressbar.cpp
    M src/widgets/scrollbar.cpp
    M src/widgets/scrollpane.cpp
    M src/widgets/slider.cpp
    M src/widgets/textbox.cpp
    M src/widgets/textbox.hpp
    M src/widgets/widget.cpp
    M src/widgets/widget.hpp

  Log Message:
  -----------
  Merge pull request #555 from wesnoth/sdl2

Merge Sdl2 branch with Master.

This adds SDL2 support to master and makes it the default build option.


Compare: https://github.com/wesnoth/wesnoth/compare/87e8fbb425ba...3f9d9ca3399a


More information about the Commits mailing list