diff options
| author | Spp <spp@jorge.gr> | 2012-11-04 20:17:37 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-11-04 20:17:37 +0100 |
| commit | 06eff945065b65cf707837eca6c940ecbf8c7122 (patch) | |
| tree | 1f47345347b13ad58cf8bcf5792711df88883758 /src/server/game/Reputation/ReputationMgr.cpp | |
| parent | c6ce7bc9fd7a44acc18b50ec9aa933b96ff8799d (diff) | |
| parent | a5a9503bbe80068863bc129afcb41e5ea02cd8b3 (diff) | |
Merge branch 'master' into 4.3.4
Note: Will need extra Guild-Related commit to make it work again (Added some extra data beside the merge)
Conflicts:
src/server/game/Battlefield/BattlefieldHandler.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Guilds/Guild.cpp
src/server/game/Guilds/Guild.h
src/server/game/Guilds/GuildMgr.cpp
src/server/game/Guilds/GuildMgr.h
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/ChatHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Handlers/GuildHandler.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/game/Handlers/LootHandler.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Handlers/MovementHandler.cpp
src/server/game/Handlers/NPCHandler.cpp
src/server/game/Handlers/PetHandler.cpp
src/server/game/Handlers/PetitionsHandler.cpp
src/server/game/Handlers/QueryHandler.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Handlers/SkillHandler.cpp
src/server/game/Handlers/SpellHandler.cpp
src/server/game/Handlers/TaxiHandler.cpp
src/server/game/Handlers/VehicleHandler.cpp
src/server/game/Server/WorldSession.h
src/server/shared/Database/Implementation/CharacterDatabase.cpp
src/server/shared/Database/Implementation/CharacterDatabase.h
Diffstat (limited to 'src/server/game/Reputation/ReputationMgr.cpp')
0 files changed, 0 insertions, 0 deletions