Carbenium
293658fb13
Merge branch '3.3.5' into 4.3.4
Conflicts:
.gitattributes
dep/PackageList.txt
sql/base/characters_database.sql
sql/updates/world/2015_06_26_01_world_2015_05_15_00.sql
sql/updates/world/2015_07_01_03_world_335.sql
src/server/game/DungeonFinding/LFGMgr.cpp
src/server/game/Entities/GameObject/GameObject.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Handlers/QueryHandler.cpp
src/server/game/Miscellaneous/Language.h
src/server/game/Quests/QuestDef.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/scripts/Commands/cs_rbac.cpp
src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
src/server/scripts/Spells/spell_quest.cpp
src/server/shared/Database/Implementation/CharacterDatabase.cpp
src/server/shared/Database/Implementation/WorldDatabase.cpp
2015-07-22 02:26:46 +02:00
..
2015-07-19 13:37:44 +02:00
2015-07-22 00:54:34 +02:00
2015-07-19 14:38:37 +02:00
2015-07-19 13:37:44 +02:00
2015-07-19 13:37:44 +02:00
2015-07-22 02:13:10 +02:00
2015-07-19 15:03:13 +02:00
2015-07-19 14:38:37 +02:00
2014-06-21 19:39:16 +02:00
2012-11-12 10:29:52 +01:00
2013-07-20 14:55:25 +01:00
2015-07-19 14:38:37 +02:00
2015-07-19 13:37:44 +02:00
2015-07-22 02:26:46 +02:00
2015-07-22 02:26:46 +02:00