DDuarte 5bf55eacfd Merge remote-tracking branch 'origin/3.3.5' into 4.3.4 ...

Conflicts:
	sql/base/auth_database.sql
	src/server/game/Instances/InstanceScript.h
	src/server/scripts/Northrend/isle_of_conquest.cpp
	src/server/shared/Database/Implementation/LoginDatabase.cpp
	src/server/shared/Database/Implementation/LoginDatabase.h

2014-10-19 00:18:06 +01:00

..

CMakeLists.txt

Update copyright note for 2014.

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

spell_dk.cpp

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

2014-09-27 05:23:46 +02:00

spell_druid.cpp

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

2014-09-27 05:23:46 +02:00

spell_generic.cpp

Merge remote-tracking branch 'origin/3.3.5' into 4.3.4

2014-10-19 00:18:06 +01:00

spell_holiday.cpp

Core/Brewfest: Fix typo in b74ef3f3ca (thx to Gooyeth)

2014-10-03 16:03:13 +02:00

spell_hunter.cpp

Merge remote-tracking branch 'origin/master' into 4.3.4

2014-07-19 03:51:11 +02:00

spell_item.cpp

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

2014-08-24 02:11:33 +02:00

spell_mage.cpp

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

2014-09-27 05:23:46 +02:00

spell_paladin.cpp

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

2014-09-27 05:23:46 +02:00

spell_pet.cpp

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

2014-09-27 05:23:46 +02:00

spell_priest.cpp

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

2014-09-27 05:23:46 +02:00

spell_quest.cpp

Fear No Evil changes

2014-09-30 01:14:24 +02:00

spell_rogue.cpp

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

2014-09-27 05:23:46 +02:00

spell_shaman.cpp

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

2014-09-27 05:23:46 +02:00

spell_warlock.cpp

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

2014-09-27 05:23:46 +02:00

spell_warrior.cpp

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

2014-09-27 05:23:46 +02:00