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

Conflicts:
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Handlers/GroupHandler.cpp

2014-10-18 15:54:30 +02:00

..

genrev

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

server

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

2014-10-18 15:54:30 +02:00

tools

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

2014-10-10 05:29:06 +02:00

CMakeLists.txt

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00