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

Conflicts:
	sql/base/auth_database.sql
	sql/base/characters_database.sql
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Spells/spell_generic.cpp

2013-02-04 22:14:56 +01:00

..

auth

Rename sql files of 760d62e934

2013-02-04 16:43:12 +01:00

characters

Core/Titles: There are now 4 title fields (only 2 titles for now, Ruthless and Cataclysmic Gladiator).

2013-01-30 07:05:19 +02:00

world

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

2013-02-04 22:14:56 +01:00