Merge branch '3.3.5' into 4.3.4

0 Fork 0

Conflicts:
	sql/base/dev/world_database.sql
	sql/updates/world/2015_07_14_00_world.sql
	sql/updates/world/2015_07_14_01_world_335.sql
	sql/updates/world/2015_07_19_00_world_2015_07_18_04.sql
	sql/updates/world/2015_07_19_05_world.sql
	sql/updates/world/2015_07_21_00_world.sql
	sql/updates/world/2015_07_24_00_world.sql
	sql/updates/world/2015_07_24_01_world.sql
	sql/updates/world/2015_07_24_02_world.sql
	sql/updates/world/2015_07_24_03_world.sql
	sql/updates/world/2015_07_24_04_world.sql
	sql/updates/world/2015_07_24_05_world.sql
	sql/updates/world/2015_07_25_03_world.sql
	sql/updates/world/2015_07_25_04_world.sql
	src/server/collision/Management/MMapManager.cpp
	src/server/collision/Management/MMapManager.h
	src/server/game/Battlefield/Battlefield.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Guilds/Guild.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/Weather/WeatherMgr.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/shared/Utilities/Util.cpp

This commit is contained in:

Carbenium committed 2015-07-26 16:52:35 +02:00

2 parents 1d1ac1050f 66bbdfb82c

commit 86eb651757

156 files changed

+1402 -967

No files matched your search

									
										src/server/game/Handlers/QuestHandler.cpp
									
		-1
	
												View File
												
				@@ -20,7 +20,6 @@

				#include "Log.h"

				#include "WorldPacket.h"

				#include "WorldSession.h"

				#include "Opcodes.h"

				#include "World.h"

				#include "ObjectMgr.h"

				#include "Player.h"