diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-11-29 14:13:30 +0100 |
|---|---|---|
| committer | Carbenium <carbenium@outlook.com> | 2016-01-20 20:59:40 +0100 |
| commit | 038138592d32f004babfec0fb5d262b9e49e6802 (patch) | |
| tree | 5b9965a94c323b627a91e8cd1adb5537677549c3 /src/common/Threading/Callback.h | |
| parent | a6dd6d7841d6ab3e496d492d225c5541721c8dfd (diff) | |
Merge pull request #15995 from ShinDarth/mmr
Core/Arena: more arena configs
(cherry picked from commit 776103cfea4bbced71d47f7d5c7dbb8b78dfe7fe)
Conflicts:
src/server/game/Battlegrounds/ArenaTeam.cpp
Diffstat (limited to 'src/common/Threading/Callback.h')
0 files changed, 0 insertions, 0 deletions