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/game/Handlers/CharacterHandler.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/game/Handlers/CharacterHandler.cpp') diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index 3afd38a2bff..3dc6b72157a 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -44,7 +44,7 @@ #include "Player.h" #include "QueryPackets.h" #include "ReputationMgr.h" -#include "Revision.h" +#include "GitRevision.h" #include "ScriptMgr.h" #include "SharedDefines.h" #include "SocialMgr.h" @@ -956,7 +956,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder) // send server info { if (sWorld->getIntConfig(CONFIG_ENABLE_SINFO_LOGIN) == 1) - chH.PSendSysMessage(Revision::GetFullVersion()); + chH.PSendSysMessage(GitRevision::GetFullVersion()); TC_LOG_DEBUG("network", "WORLD: Sent server info"); } -- cgit v1.2.3