mirror of
https://github.com/vcmi/vcmi.git
synced 2025-01-04 00:15:53 +02:00
6e205a58b4
Conflicts: lib/VCMI_lib.cbp lib/filesystem/CZipLoader.cpp lib/filesystem/CZipLoader.h lib/mapObjects/CGTownInstance.cpp |
||
---|---|---|
.. | ||
AdventureSpellMechanics.cpp | ||
AdventureSpellMechanics.h | ||
BattleSpellMechanics.cpp | ||
BattleSpellMechanics.h | ||
CDefaultSpellMechanics.cpp | ||
CDefaultSpellMechanics.h | ||
CreatureSpellMechanics.cpp | ||
CreatureSpellMechanics.h | ||
CSpellHandler.cpp | ||
CSpellHandler.h | ||
ISpellMechanics.cpp | ||
ISpellMechanics.h | ||
Magic.h | ||
SpellMechanics.h | ||
ViewSpellInt.cpp | ||
ViewSpellInt.h |