Merge branch 'master' into 4.3.4

Conflicts:
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_generic.cpp
This commit is contained in:
DDuarte committed 2014-07-24 17:10:21 +01:00
commit cdb33ab174
24 files changed
+350 -236

No files matched your search

@@ -21,6 +21,8 @@
#include "Log.h"
#pragma pack(push, 1)
struct ServerPktHeader
{
/**
@@ -56,4 +58,6 @@ struct ServerPktHeader
uint8 header[5];
};
#pragma pack(pop)
#endif