mirror of
https://github.com/vcmi/vcmi.git
synced 2025-03-19 21:10:12 +02:00
# Conflicts: # client/CServerHandler.cpp # lib/serializer/Connection.cpp # lib/serializer/Connection.h # server/CVCMIServer.cpp
# Conflicts: # client/CServerHandler.cpp # lib/serializer/Connection.cpp # lib/serializer/Connection.h # server/CVCMIServer.cpp