DDuarte 33c2bd5ce1 Merge branch 'master' into 4.3.4 ...

Conflicts:
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_desolace.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/tools/CMakeLists.txt

2014-01-10 18:32:05 +00:00

..

acelite

Buildsystem/MSVC

2013-06-15 14:07:12 +02:00

bzip2

Dependencies/bzip: Remove bzip2.c and bzip2recover.c, they are not required

2013-08-11 20:08:33 +01:00

g3dlite

Dep/G3D: Fix encoding of G3D-v8.0_hotfix8.diff

2013-09-01 17:50:48 +01:00

gsoap

Core/Dependencies: Fix an issue with CMake not being able to determine the language when linking gsoap

2013-04-30 23:28:24 +02:00

jemalloc

Core/Dependencies: Upgrade to jemalloc-3.3.1 (Also fixes a few weird crashes), closes #7852

2013-04-16 21:03:29 +02:00

mysqllite

Core/Scripting: Replace casted with cast as casted is not a word.

2013-12-25 14:16:55 -03:30

recastnavigation

Tools/MeshExtractor: Updated RecastNavigation to the latest version from git

2013-12-29 22:59:00 -05:00

SFMT

SQL: Rename SQL merged in PR

2013-01-23 20:29:40 +01:00

StormLib

Core/Build: Remove some more unneeded code for OS X from cmake files

2012-11-12 10:29:52 +01:00

utf8cpp

Core/Dependencies: Update utf8-cpp to version 2.3.4

2013-07-20 14:55:25 +01:00

zlib

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

CMakeLists.txt

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

2013-01-28 01:04:37 +00:00

PackageList.txt

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

2013-07-20 21:07:49 +02:00