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/shared/PrecompiledHeaders | |
| 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/shared/PrecompiledHeaders')
| -rw-r--r-- | src/server/shared/PrecompiledHeaders/sharedPCH.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/shared/PrecompiledHeaders/sharedPCH.h b/src/server/shared/PrecompiledHeaders/sharedPCH.h index f4c18f89ec1..366cc977337 100644 --- a/src/server/shared/PrecompiledHeaders/sharedPCH.h +++ b/src/server/shared/PrecompiledHeaders/sharedPCH.h @@ -8,4 +8,4 @@ #include "TypeList.h" #include "TaskScheduler.h" #include "EventMap.h" -#include "Revision.h" +#include "GitRevision.h" |