diff options
| author | jackpoz <giacomopoz@gmail.com> | 2015-08-16 23:27:25 +0200 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-08-16 22:45:18 +0100 |
| commit | 4617d65131e3726fa5ec0395a9e1bee85d849066 (patch) | |
| tree | e05426f3c6b7b195e4d65007bb664f48f85d0dac /src/server/scripts/Commands | |
| parent | 6a9fc63e412adf7074c2850320cddf007edc3b28 (diff) | |
Merge pull request #15297 from StormBytePP/3.3.5_rename_Revision.h
Core/Build: Renamed Revision.h to GitRevision.h to avoid compile failure when old revision.h file is present
(cherry picked from commit 360cc93357d1b51258986e547ac29dddac20159c)
Conflicts:
src/server/authserver/Main.cpp
src/server/database/Updater/DBUpdater.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/World/World.cpp
src/server/shared/PrecompiledHeaders/sharedPCH.h
src/server/worldserver/Main.cpp
Diffstat (limited to 'src/server/scripts/Commands')
| -rw-r--r-- | src/server/scripts/Commands/cs_server.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/scripts/Commands/cs_server.cpp b/src/server/scripts/Commands/cs_server.cpp index 5f844ab826b..e65ac5f2105 100644 --- a/src/server/scripts/Commands/cs_server.cpp +++ b/src/server/scripts/Commands/cs_server.cpp @@ -28,7 +28,7 @@ EndScriptData */ #include "ObjectAccessor.h" #include "Player.h" #include "ScriptMgr.h" -#include "Revision.h" +#include "GitRevision.h" class server_commandscript : public CommandScript { @@ -115,7 +115,7 @@ public: std::string uptime = secsToTimeString(sWorld->GetUptime()); uint32 updateTime = sWorld->GetUpdateTime(); - handler->SendSysMessage(Revision::GetFullVersion()); + handler->SendSysMessage(GitRevision::GetFullVersion()); handler->PSendSysMessage(LANG_CONNECTED_PLAYERS, playersNum, maxPlayersNum); handler->PSendSysMessage(LANG_CONNECTED_USERS, activeClientsNum, maxActiveClientsNum, queuedClientsNum, maxQueuedClientsNum); handler->PSendSysMessage(LANG_UPTIME, uptime.c_str()); |