mirror of
https://github.com/wesnoth/wesnoth
synced 2025-05-07 23:48:56 +00:00

Rebased version of e6c58fc35cc398d70f31817f8b3ba783bfa08a6d, with merge conflicts resolved.
Rebased version of e6c58fc35cc398d70f31817f8b3ba783bfa08a6d, with merge conflicts resolved.