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

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h

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

..

CMakeLists.txt

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

spell_dk.cpp

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

spell_druid.cpp

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

spell_generic.cpp

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

spell_holiday.cpp

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

spell_hunter.cpp

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

spell_item.cpp

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

spell_mage.cpp

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

spell_paladin.cpp

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

spell_pet.cpp

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

spell_priest.cpp

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

spell_quest.cpp

Core/Scripts: Fix kill credit for quest The Hunter and the Prince(13400).

2014-01-19 00:30:25 +02:00

spell_rogue.cpp

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

spell_shaman.cpp

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

spell_warlock.cpp

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

spell_warrior.cpp

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

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