Carbenium 99ab531e76 Merge branch '3.3.5' into 4.3.4 ...

Conflicts:
	sql/updates/world/2015_07_29_00_world.sql
	sql/updates/world/2015_07_29_01_world.sql
	sql/updates/world/2015_08_01_00_world.sql
	src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.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/Spells/spell_hunter.cpp
	src/server/scripts/Spells/spell_pet.cpp

2015-08-12 21:05:39 +02:00

..

compiler

Buildsystem/MSVC: Enabled /bigobj for all x64 build types

2015-07-25 16:42:46 +01:00

macros

Merge branch '3.3.5' into 4.3.4

2015-08-12 21:05:39 +02:00

platform

Core/Misc: Disable G3D buffer pools if jemalloc is enabled

2015-06-08 20:49:54 +02:00

genrev.cmake

Update (C) date

2015-07-19 13:37:44 +02:00

options.cmake

Tools: Remove mesh_extractor

2015-07-19 14:13:38 +02:00

showoptions.cmake

Core/Misc: Add valgrind support for jemalloc

2015-06-20 23:01:53 +02:00

stack_direction.c

Core: Remove whitespace

2014-08-27 23:22:16 +02:00