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

Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/Spells/SpellMgr.h
	src/server/game/World/World.cpp

2013-07-25 00:41:37 +02:00

..

CharacterDatabase.cpp

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

2013-07-25 00:41:37 +02:00

CharacterDatabase.h

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

2013-05-30 20:57:07 +02:00

LoginDatabase.cpp

Core/Command: Rework PInfo and give more output and add Gender to trinity_string

2013-05-20 03:09:34 +02:00

LoginDatabase.h

Core/World: Improvements in Autobroadcast system (dropped from world database and moved to auth database, added realmid and weight columns)

2013-04-25 22:54:20 +02:00

WorldDatabase.cpp

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

2013-05-30 20:57:07 +02:00

WorldDatabase.h

Core/Command: Rework PInfo and give more output and add Gender to trinity_string

2013-05-20 03:09:34 +02:00