diff options
| author | Faq <ainarsh@gmail.com> | 2012-08-21 10:58:15 +0300 |
|---|---|---|
| committer | Faq <ainarsh@gmail.com> | 2012-08-21 10:58:15 +0300 |
| commit | 291b0899c503bc7bf7d8463a984fd8b638867eda (patch) | |
| tree | 7a76f1ec88a89adf5d79bf8e1ba670baa8d56745 /src/server/game/Scripting/ScriptMgr.h | |
| parent | c400923a1a96e458ca8b33b6979abc6b344cb41f (diff) | |
| parent | 542521a026031764ddd98518e7f5bdab91bc0ebb (diff) | |
Merge remote-tracking branch 'upstream/master' into SpellMasks_0
Diffstat (limited to 'src/server/game/Scripting/ScriptMgr.h')
| -rwxr-xr-x | src/server/game/Scripting/ScriptMgr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 3c2ee81afff..270182509f9 100755 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -164,7 +164,7 @@ class ScriptObject protected: ScriptObject(const char* name) - : _name(std::string(name)) + : _name(name) { } |