mirror of
https://github.com/vcmi/vcmi.git
synced 2025-02-17 13:41:07 +02:00
Conflicts: client/windows/CHeroWindow.cpp client/windows/CQuestLog.cpp client/windows/GUIClasses.cpp
Conflicts: client/windows/CHeroWindow.cpp client/windows/CQuestLog.cpp client/windows/GUIClasses.cpp