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

Conflicts:
	src/server/game/Battlegrounds/ArenaScore.h
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/BattlegroundScore.h
	src/server/game/Handlers/MailHandler.cpp

2014-06-29 17:32:12 +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-29 17:32:12 +02:00