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, 138 deletions

diff --git a/dep/acelite/ace/streams.h b/dep/acelite/ace/streams.h
deleted file mode 100644
index 396a67c712e..00000000000
--- a/dep/acelite/ace/streams.h
+++ /dev/null
@@ -1,138 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    streams.h
- *
- *  $Id: streams.h 82445 2008-07-28 13:40:01Z johnnyw $
- *
- *  @author Irfan Pyarali
- *
- *  This file contains the portability ugliness for the Standard C++
- *  Library.  As implementations of the "standard" emerge, this file
- *  will need to be updated.
- *
- *  This files deals with the streams includes.
- *
- *
- */
-//=============================================================================
-
-
-#ifndef ACE_STREAMS_H
-#define ACE_STREAMS_H
-#include /**/ "ace/pre.h"
-
-#include /**/ "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// Do this so the #pragma warning in the MSVC headers do not
-// affect our #pragma warning settings
-#if defined (_MSC_VER)
-#pragma warning(push)
-#endif /* _MSC_VER*/
-
-
-#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-
-#  if defined (ACE_HAS_STANDARD_CPP_LIBRARY)  && \
-      (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
-
-#   if defined (_MSC_VER)
-#     pragma warning(disable: 4018 4114 4146 4245)
-#     pragma warning(disable: 4663 4664 4665 4511 4512)
-#   endif /* _MSC_VER */
-
-#   if defined (ACE_USES_OLD_IOSTREAMS)
-#     include /**/ <iostream.h>
-#     include /**/ <fstream.h>
-  // This has been commented as it is not needed and causes problems with Qt.
-  // (brunsch) But has been uncommented since it should be included.  Qt
-  // probably should have some sort of macro that will prevent including this
-  // when it is used.
-#     include /**/ <iomanip.h>
-#   else
-#     include /**/ <iostream>
-#     include /**/ <fstream>
-#     include /**/ <istream>
-#     include /**/ <ostream>
-#     include /**/ <streambuf>
-#     include /**/ <iomanip>
-#     include /**/ <ios>
-#   endif /* ACE_USES_OLD_IOSTREAMS */
-
-#   if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \
-       (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0)
-
-#     if !defined (ACE_USES_OLD_IOSTREAMS)
-        // Make these available in the global name space
-        using std::ios;
-        using std::ios_base;
-        using std::streambuf;
-        using std::istream;
-        using std::ostream;
-        using std::iostream;
-        using std::filebuf;
-        using std::ifstream;
-        using std::ofstream;
-        using std::fstream;
-
-        using std::cin;
-        using std::cout;
-        using std::cerr;
-        using std::clog;
-
-        using std::endl;
-        using std::ends;
-        using std::flush;
-
-        using std::ws;
-
-        using std::resetiosflags;
-        using std::setfill;
-        using std::setiosflags;
-        using std::setprecision;
-        using std::setw;
-
-        using std::dec;
-        using std::hex;
-        using std::oct;
-#     endif /* ! ACE_USES_OLD_IOSTREAMS */
-
-#   endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
-
-#   if defined (_MSC_VER)
-#     pragma warning(4: 4018 4114 4146 4245)
-#     pragma warning(4: 4663 4664 4665 4512 4511)
-#   endif /* _MSC_VER */
-
-# else /* ! ACE_HAS_STANDARD_CPP_LIBRARY */
-
-#   include /**/ <fstream.h>
-#   include /**/ <iostream.h>
-#   include /**/ <iomanip.h>
-
-#   if defined (ACE_WIN32) && !defined(__MINGW32__)
-#     if defined(_MSC_VER) // VSB
-#       include /**/ <ios.h>
-#       include /**/ <streamb.h>
-#       include /**/ <istream.h>
-#       include /**/ <ostream.h>
-#     endif /* _MSC_VER */
-#   endif /* ACE_WIN32 && !__MINGW32__ */
-
-# endif /* ! ACE_HAS_STANDARD_CPP_LIBRARY */
-
-#endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
-
-// Do this so the #pragma warning in the MSVC headers do not
-// affect our #pragma warning settings
-#if defined (_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_STREAMS_H */