diff options
| author | MitchesD <majklprofik@seznam.cz> | 2015-05-30 19:34:25 +0200 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-06-01 00:39:56 +0100 |
| commit | db8fdd94ed54f46e3482ea33e8e13bf1b3940350 (patch) | |
| tree | d21c9c4008d4558d78dea98f43d5d36a02191266 /src/server/shared/Utilities/TaskScheduler.h | |
| parent | 79dd72ae704bce27f59f33dc99f93e2c36755b0e (diff) | |
Merge pull request #14782 from doctaweeks/fixes-for-6.x
Minor fixes for 6.x
(cherry picked from commit 0cf02097414ddf7a370bd2efef5b892616e8de93)
Conflicts:
src/server/bnetserver/Main.cpp
src/server/game/Battlegrounds/Zones/BattlegroundBFG.h
src/server/game/Battlegrounds/Zones/BattlegroundTP.h
src/server/game/Chat/Channels/Channel.h
src/server/game/Entities/Player/Player.h
src/server/game/Quests/QuestDef.h
src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
src/server/shared/Cryptography/SHA256.h
Diffstat (limited to 'src/server/shared/Utilities/TaskScheduler.h')
0 files changed, 0 insertions, 0 deletions