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

Conflicts:
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Server/WorldSession.cpp

2013-09-01 23:48:40 +02:00

..

auth

Core/RBAC: Move bf commands to RBAC (using individual permissions)

2013-08-31 21:02:14 +01:00

characters

SQL: Rename in correct name

2013-07-19 14:01:25 +02:00

world

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

2013-09-01 23:48:40 +02:00