mirror of
https://github.com/EQEmu/Server.git
synced 2025-12-12 01:11:29 +00:00
Conflicts: changelog.txt common/spdat.h zone/attack.cpp zone/bonuses.cpp zone/common.h zone/mob.h zone/special_attacks.cpp zone/spell_effects.cpp