diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-20 03:06:03 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-20 03:06:03 +0200 |
| commit | e68d3b0937e205c94c17d7cb1a53194b6d169fe8 (patch) | |
| tree | 326d69976375006fe244df6e858bd20e83fcae90 /src/server/game/Calendar/CalendarMgr.h | |
| parent | abe8dd7abf70b3589ad0cbba19f91bd4f743bf3e (diff) | |
| parent | 0531f52008cfc4ecb28c0b3cd67504e06452ab75 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
src/server/scripts/Northrend/zone_dalaran.cpp
src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp
Diffstat (limited to 'src/server/game/Calendar/CalendarMgr.h')
| -rw-r--r-- | src/server/game/Calendar/CalendarMgr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Calendar/CalendarMgr.h b/src/server/game/Calendar/CalendarMgr.h index 8d744988a76..3dadcbdf645 100644 --- a/src/server/game/Calendar/CalendarMgr.h +++ b/src/server/game/Calendar/CalendarMgr.h @@ -283,8 +283,8 @@ class CalendarMgr public: static CalendarMgr* instance() { - static CalendarMgr* instance = new CalendarMgr(); - return instance; + static CalendarMgr instance; + return &instance; } void LoadFromDB(); |