diff options
author | Shauren <shauren.trinity@gmail.com> | 2013-05-30 20:57:07 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2013-05-30 20:57:07 +0200 |
commit | adb78862da66b13984c6494befdffbf5da0cdbe6 (patch) | |
tree | 1514857a0131189194c251b7045d234a2bf45d86 /src/server/authserver/Authentication/AuthCodes.cpp | |
parent | cf23793b4b04cfe12f6fc1441a7d9f8192f7dfa6 (diff) | |
parent | 3a697d4c9f5e9f2fa9c3b08c8e103d90472a871a (diff) |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Vehicle/Vehicle.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Server/Protocol/Opcodes.h
src/server/scripts/Commands/cs_misc.cpp
Diffstat (limited to 'src/server/authserver/Authentication/AuthCodes.cpp')
-rw-r--r-- | src/server/authserver/Authentication/AuthCodes.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/server/authserver/Authentication/AuthCodes.cpp b/src/server/authserver/Authentication/AuthCodes.cpp index 55229e0d18b..b47ef21b24b 100644 --- a/src/server/authserver/Authentication/AuthCodes.cpp +++ b/src/server/authserver/Authentication/AuthCodes.cpp @@ -37,6 +37,7 @@ namespace AuthHelper static RealmBuildInfo const PreBcAcceptedClientBuilds[] = { + {6141, 1, 12, 3, ' '}, {6005, 1, 12, 2, ' '}, {5875, 1, 12, 1, ' '}, {0, 0, 0, 0, ' '} // terminator |