diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2014-07-22 13:15:36 +0100 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2014-07-22 13:15:36 +0100 |
| commit | 01d9681a4d75be566f359f54fc37173b043befdf (patch) | |
| tree | da097e38d1c4f7b71b929ba6477156d5b5da3171 /src/server/shared/Configuration/Config.cpp | |
| parent | 4f6db255a23b8d321bea2265295fd09ba3095833 (diff) | |
| parent | 44c0d66d63f58a022045efbb6cff6e1278f6a8cb (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/authserver/Realms/RealmList.cpp
src/server/scripts/EasternKingdoms/zone_ironforge.cpp
Diffstat (limited to 'src/server/shared/Configuration/Config.cpp')
| -rw-r--r-- | src/server/shared/Configuration/Config.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/shared/Configuration/Config.cpp b/src/server/shared/Configuration/Config.cpp index 5cd7ef52f82..ecebf30182e 100644 --- a/src/server/shared/Configuration/Config.cpp +++ b/src/server/shared/Configuration/Config.cpp @@ -103,6 +103,6 @@ std::list<std::string> ConfigMgr::GetKeysByString(std::string const& name) for (const ptree::value_type& child : _config) if (child.first.compare(0, name.length(), name) == 0) keys.push_back(child.first); - + return keys; } |