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

Conflicts:
	src/server/authserver/Main.cpp
	src/server/authserver/Realms/RealmList.cpp
	src/server/authserver/Realms/RealmList.h
	src/server/authserver/Server/AuthSession.cpp
	src/server/authserver/Server/AuthSocket.h
	src/server/authserver/Server/RealmAcceptor.h
	src/server/game/Accounts/AccountMgr.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/shared/Cryptography/BigNumber.h
	src/server/worldserver/RemoteAccess/RASocket.cpp
	src/server/worldserver/worldserver.conf.dist

1 files changed, 0 insertions, 91 deletions

diff --git a/dep/acelite/ace/Flag_Manip.cpp b/dep/acelite/ace/Flag_Manip.cpp
deleted file mode 100644
index 6a497579874..00000000000
--- a/dep/acelite/ace/Flag_Manip.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-// $Id: Flag_Manip.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
-
-#include "ace/Flag_Manip.h"
-
-#if defined (ACE_LACKS_FCNTL)
-#  include "ace/OS_NS_stropts.h"
-#  include "ace/OS_NS_errno.h"
-#endif /* ACE_LACKS_FCNTL */
-
-#if !defined (__ACE_INLINE__)
-#include "ace/Flag_Manip.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (CYGWIN32)
-#  include "ace/os_include/os_termios.h"
-#endif /* CYGWIN32 */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// Flags are file status flags to turn on.
-
-int
-ACE::set_flags (ACE_HANDLE handle, int flags)
-{
-  ACE_TRACE ("ACE::set_flags");
-#if defined (ACE_LACKS_FCNTL)
-  switch (flags)
-    {
-    case ACE_NONBLOCK:
-      // nonblocking argument (1)
-      // blocking:            (0)
-      {
-        int nonblock = 1;
-        return ACE_OS::ioctl (handle, FIONBIO, &nonblock);
-      }
-    default:
-      ACE_NOTSUP_RETURN (-1);
-    }
-#else
-  int val = ACE_OS::fcntl (handle, F_GETFL, 0);
-
-  if (val == -1)
-    return -1;
-
-  // Turn on flags.
-  ACE_SET_BITS (val, flags);
-
-  if (ACE_OS::fcntl (handle, F_SETFL, val) == -1)
-    return -1;
-  else
-    return 0;
-#endif /* ACE_LACKS_FCNTL */
-}
-
-// Flags are the file status flags to turn off.
-
-int
-ACE::clr_flags (ACE_HANDLE handle, int flags)
-{
-  ACE_TRACE ("ACE::clr_flags");
-
-#if defined (ACE_LACKS_FCNTL)
-  switch (flags)
-    {
-    case ACE_NONBLOCK:
-      // nonblocking argument (1)
-      // blocking:            (0)
-      {
-        int nonblock = 0;
-        return ACE_OS::ioctl (handle, FIONBIO, &nonblock);
-      }
-    default:
-      ACE_NOTSUP_RETURN (-1);
-    }
-#else
-  int val = ACE_OS::fcntl (handle, F_GETFL, 0);
-
-  if (val == -1)
-    return -1;
-
-  // Turn flags off.
-  ACE_CLR_BITS (val, flags);
-
-  if (ACE_OS::fcntl (handle, F_SETFL, val) == -1)
-    return -1;
-  else
-    return 0;
-#endif /* ACE_LACKS_FCNTL */
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL