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

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/scripts/Spells/spell_dk.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_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp

2013-07-24 03:21:25 +02:00

..

base

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

2013-07-19 22:33:35 +02:00

create

…

old

TDB 424.05

2013-07-17 00:56:05 +01:00

updates

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

2013-07-24 03:21:25 +02:00