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

Conflicts:
	src/server/game/Accounts/RBAC.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Server/Protocol/Opcodes.cpp

2014-01-19 20:52:16 +01:00

..

genrev

Update copyright note for 2014.

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

server

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

2014-01-19 20:52:16 +01:00

tools

Fix revert fail in ad8c046916

2014-01-18 20:31:41 +01:00

CMakeLists.txt

Update copyright note for 2014.

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