diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-01 22:19:13 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-01 22:19:13 +0100 |
| commit | 2e1de60593fda0c1ad766fb0333a1992b17c35b9 (patch) | |
| tree | 90d942b50b5f43676391192d6e2e81ed7c513b5d /src/server/shared/Logging/Log.h | |
| parent | d218afa19849e1be810bb06c96402cff956dc036 (diff) | |
| parent | a7dd289b04e3a9d0337fb5b6db3fc7a70f670933 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/worldserver/worldserver.conf.dist
Diffstat (limited to 'src/server/shared/Logging/Log.h')
| -rw-r--r-- | src/server/shared/Logging/Log.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/shared/Logging/Log.h b/src/server/shared/Logging/Log.h index cd1e9dc80df..7980df0d52a 100644 --- a/src/server/shared/Logging/Log.h +++ b/src/server/shared/Logging/Log.h @@ -56,7 +56,7 @@ class Log void EnableDBAppenders(); void outCommand(uint32 account, const char * str, ...) ATTR_PRINTF(3, 4); - void outCharDump(const char* param, const char* str, ...) ATTR_PRINTF(3, 4); + void outCharDump(char const* str, uint32 account_id, uint32 guid, char const* name); static std::string GetTimestampStr(); void SetRealmID(uint32 id); |