nordsoft 0250e6fb92 Merge branch 'develop-upstream' into town-buildings ... # Conflicts: # client/CPlayerInterface.cpp # client/windows/CTradeWindow.cpp # config/objects/generic.json # lib/mapObjects/CGMarket.cpp # lib/mapObjects/CGMarket.h # lib/mapObjects/CGTownInstance.cpp # lib/mapObjects/CommonConstructors.cpp # lib/mapObjects/CommonConstructors.h		2023-05-02 01:48:13 +04:00
..
Configuration.cpp
Configuration.h
Info.cpp	Attempt to fix msvs build 1	2023-05-01 01:15:48 +04:00
Info.h
Interface.cpp	Merge branch 'develop-upstream' into town-buildings	2023-05-02 01:48:13 +04:00
Interface.h
Limiter.cpp	Attempt to fix msvs build 1	2023-05-01 01:15:48 +04:00
Limiter.h
Reward.cpp
Reward.h