diff options
| author | MitchesD <majklprofik@seznam.cz> | 2015-10-18 15:55:39 +0200 |
|---|---|---|
| committer | Carbenium <carbenium@outlook.com> | 2015-11-07 00:37:34 +0100 |
| commit | 42cf4e7713123db3a098c6a52deb3c7ddd78ed42 (patch) | |
| tree | 7a9c2fbbcace5ab8b98fdd6eb0532b3a09710eaf /src/server/game/Scripting/ScriptLoader.cpp | |
| parent | 63f253e95ca801966077282f27767cf1d191bfec (diff) | |
Merge pull request #15727 from ShinDarth/duel-cd
Core/SpellHistory: Improved Cooldown Duel Reset
(cherry picked from commit 981e764004cc8b09c8f29205d9675bfd6e02ae7b)
Conflicts:
src/server/game/Spells/SpellHistory.cpp
Diffstat (limited to 'src/server/game/Scripting/ScriptLoader.cpp')
0 files changed, 0 insertions, 0 deletions