From 4617d65131e3726fa5ec0395a9e1bee85d849066 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sun, 16 Aug 2015 23:27:25 +0200 Subject: 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 --- src/server/scripts/Commands/cs_server.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/scripts/Commands') 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()); -- cgit v1.2.3