diff options
author | Rat <gmstreetrat@gmail.com> | 2015-03-29 11:25:48 +0200 |
---|---|---|
committer | Rat <gmstreetrat@gmail.com> | 2015-03-29 11:25:48 +0200 |
commit | 3660c3a37f7f5a61e14f28c09f94f57fe6315788 (patch) | |
tree | 61e92a0de035697d350d1545c1bdafd569d91778 /src/server/shared/Updater/UpdateFetcher.cpp | |
parent | eebc468e628acc801a6426e03815150c8cfd9172 (diff) | |
parent | c26dbb786a91b0454a8648039b63d3dc9ddd1c42 (diff) |
Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x
Conflicts:
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Server/Protocol/Opcodes.cpp
Diffstat (limited to 'src/server/shared/Updater/UpdateFetcher.cpp')
-rw-r--r-- | src/server/shared/Updater/UpdateFetcher.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/shared/Updater/UpdateFetcher.cpp b/src/server/shared/Updater/UpdateFetcher.cpp index b93ca614729..2b12f39780c 100644 --- a/src/server/shared/Updater/UpdateFetcher.cpp +++ b/src/server/shared/Updater/UpdateFetcher.cpp @@ -309,7 +309,7 @@ uint32 UpdateFetcher::Update(bool const redundancyChecks, bool const allowRehash CleanUp(applied); else { - TC_LOG_ERROR("sql.updates", "Cleanup is disabled! There are %zu dirty files that were applied to your database " \ + TC_LOG_ERROR("sql.updates", "Cleanup is disabled! There are " SZFMTD " dirty files that were applied to your database " \ "but are now missing in your source directory!", applied.size()); } } |