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

Conflicts:
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_gobject.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
	src/server/scripts/Spells/spell_paladin.cpp

2014-04-19 19:57:46 +02:00

..

CMakeLists.txt

Update copyright note for 2014.

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

cs_account.cpp

Update copyright note for 2014.

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

cs_achievement.cpp

Update copyright note for 2014.

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

cs_arena.cpp

Update copyright note for 2014.

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

cs_ban.cpp

Misc: Minor cosmetic changes here and there

2014-01-21 20:20:38 +01:00

cs_bf.cpp

Update copyright note for 2014.

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

cs_cast.cpp

Update copyright note for 2014.

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

cs_character.cpp

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

2014-04-05 20:43:05 +02:00

cs_cheat.cpp

Merge branch 'master' into 4.3.4

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

cs_debug.cpp

Merge branch 'master' into 4.3.4

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

cs_deserter.cpp

Update copyright note for 2014.

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

cs_disable.cpp

Update copyright note for 2014.

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

cs_event.cpp

Update copyright note for 2014.

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

cs_gm.cpp

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

2014-01-19 20:52:16 +01:00

cs_go.cpp

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

2014-04-05 20:43:05 +02:00

cs_gobject.cpp

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

2014-04-19 19:57:46 +02:00

cs_group.cpp

Update copyright note for 2014.

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

cs_guild.cpp

Merge branch 'master' into 4.3.4

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

cs_honor.cpp

Update copyright note for 2014.

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

cs_instance.cpp

Update copyright note for 2014.

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

cs_learn.cpp

Merge branch 'master' into 4.3.4

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

cs_lfg.cpp

Update copyright note for 2014.

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

cs_list.cpp

Merge branch 'master' into 4.3.4

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

cs_lookup.cpp

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

2014-04-05 20:43:05 +02:00

cs_message.cpp

Update copyright note for 2014.

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

cs_misc.cpp

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

2014-04-05 20:43:05 +02:00

cs_mmaps.cpp

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

2014-04-19 19:57:46 +02:00

cs_modify.cpp

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

2014-04-19 19:57:46 +02:00

cs_npc.cpp

Merge branch 'master' into 4.3.4

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

cs_pet.cpp

Update copyright note for 2014.

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

cs_quest.cpp

Core/Entities: allow interaction with gameobject questgivers if player can take or return quests

2014-02-06 21:23:18 +01:00

cs_rbac.cpp

Update copyright note for 2014.

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

cs_reload.cpp

Merge branch 'master' into 4.3.4

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

cs_reset.cpp

Merge branch 'master' into 4.3.4

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

cs_send.cpp

Update copyright note for 2014.

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

cs_server.cpp

Update copyright note for 2014.

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

cs_tele.cpp

Update copyright note for 2014.

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

cs_ticket.cpp

Update copyright note for 2014.

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

cs_titles.cpp

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

2014-04-05 20:43:05 +02:00

cs_wp.cpp

Merge branch 'master' into 4.3.4

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