Yehonal 20c0e83954 Merge branch 'master' of git@github.com:azerothcore/azerothcore-wotlk.git ...

# Conflicts:
#	src/server/game/Battlegrounds/ArenaTeam.cpp
#	src/server/game/Entities/Player/Player.h
#	src/server/game/Handlers/BattleGroundHandler.cpp
#	src/server/game/Handlers/MiscHandler.cpp
#	src/server/game/Scripting/ScriptMgr.h
#	src/server/game/World/World.h
#	src/server/shared/Database/Implementation/CharacterDatabase.cpp
#	src/server/shared/Database/Implementation/CharacterDatabase.h
#	src/server/worldserver/worldserver.conf.dist

2016-08-08 12:16:55 +02:00

..

cmake

Merging

2016-08-07 12:47:10 +02:00

genrev

restructured repository based on following standards:

2016-07-08 23:58:11 +02:00

server

Merge branch 'master' of git@github.com:azerothcore/azerothcore-wotlk.git

2016-08-08 12:16:55 +02:00

tools

compilation fixed

2016-07-10 17:14:06 +02:00

CMakeLists.txt

First Commit

2016-06-26 10:39:44 +02:00