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

Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/scripts/Commands/cs_guild.cpp

2014-08-29 21:18:23 +02:00

..

auth

Scripts/Commands: Implement .guild info command

2014-08-28 23:04:52 +01:00

characters

Core/BattleGrounds: store data about BGs victories

2014-08-28 15:32:38 +01:00

world

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

2014-08-29 21:18:23 +02:00