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
This commit is contained in:
Vincent-Michael committed 2014-07-20 03:06:03 +02:00
commit e68d3b0937
71 files changed
+1036 -499

No files matched your search

+2 -2
View File
@@ -880,8 +880,8 @@ class ScriptMgr
public: /* Initialization */
static ScriptMgr* instance()
{
static ScriptMgr* instance = new ScriptMgr();
return instance;
static ScriptMgr instance;
return &instance;
}
void Initialize();