Vincent-Michael 3b1c659b60 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 ...

Conflicts:
	src/server/game/Battlegrounds/ArenaTeam.h
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h

2014-06-28 21:07:41 +02:00

..

auth

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2014-06-26 00:13:34 +02:00

characters

SQL: Renamed files to match the naming rules

2014-06-14 17:13:11 +02:00

world

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2014-06-28 21:07:41 +02:00