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

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/Spell.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warrior.cpp

2014-01-26 18:22:06 +01:00

..

auth

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

2014-01-21 21:58:30 +01:00

characters

Core/Movement: Add LOS check for fleeingmovement target point.

2014-01-12 00:33:33 +00:00

world

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

2014-01-26 18:22:06 +01:00