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/game/Events/GameEventMgr.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/game/Events/GameEventMgr.h')
| -rw-r--r-- | src/server/game/Events/GameEventMgr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h index a47b6f29e80..eb29e463a4d 100644 --- a/src/server/game/Events/GameEventMgr.h +++ b/src/server/game/Events/GameEventMgr.h @@ -96,7 +96,7 @@ class GameEventMgr { private: GameEventMgr(); - ~GameEventMgr() { }; + ~GameEventMgr() { } public: static GameEventMgr* instance() |