diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2016-03-02 01:37:38 +0000 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2016-03-02 01:38:39 +0000 |
| commit | 67b977c86a0d5fcbe5b3c89e9a19275b775d31f7 (patch) | |
| tree | cecd337936aab2ac2920f6c22829f439000a6b6f /src/server/database/Database/DatabaseLoader.cpp | |
| parent | 397519debfb3fb0e9c08b10a3257559a02a976d1 (diff) | |
Merge branch 'pets' of https://github.com/myran2/TrinityCore into myran2-pets
# Conflicts:
# src/server/game/Handlers/PetHandler.cpp
# src/server/game/Handlers/SpellHandler.cpp
# src/server/game/Server/Packets/PetPackets.cpp
# src/server/game/Server/Packets/PetPackets.h
# src/server/game/Server/Protocol/Opcodes.cpp
# src/server/game/Server/WorldSession.h
Diffstat (limited to 'src/server/database/Database/DatabaseLoader.cpp')
0 files changed, 0 insertions, 0 deletions