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

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/MailHandler.cpp

2013-02-25 17:11:36 +01:00

..

base

Core/Auth: Reverted part of fb43a92cc2 - session key is still needed after logging in to be able to switch realms

2013-02-08 01:03:56 +01:00

create

Buildsystem: Stop the retarded recursive hunting for CMakeLists.txt when copying SQL-files nad use the proper method for direct copying.

2010-12-24 18:33:11 +01:00

old

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

2013-02-18 18:51:52 +01:00

updates

Core/RBAC: Create new permissions 'See two side who list', 'Add friends of other faction', 'See all levels with who command' and 'Allows to add a gm to friend list'

2013-02-25 15:48:19 +01:00