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

diff --git a/dep/acelite/ace/Trace.cpp b/dep/acelite/ace/Trace.cpp
deleted file mode 100644
index 8acbb63421d..00000000000
--- a/dep/acelite/ace/Trace.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-// $Id: Trace.cpp 91286 2010-08-05 09:04:31Z johnnyw $
-
-#include "ace/Trace.h"
-
-// Turn off tracing for the duration of this file.
-#if defined (ACE_NTRACE)
-#undef ACE_NTRACE
-#endif /* ACE_NTRACE */
-#define ACE_NTRACE 1
-
-#include "ace/Log_Msg.h"
-#include "ace/Object_Manager_Base.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// = Static initialization.
-
-// Keeps track of how far to indent per trace call.
-int ACE_Trace::nesting_indent_ = ACE_Trace::DEFAULT_INDENT;
-
-// Is tracing enabled?
-bool ACE_Trace::enable_tracing_ = ACE_Trace::DEFAULT_TRACING;
-
-ACE_ALLOC_HOOK_DEFINE(ACE_Trace)
-
-void
-ACE_Trace::dump (void) const
-{
-#if defined (ACE_HAS_DUMP)
-#endif /* ACE_HAS_DUMP */
-}
-
-// Determine whether or not tracing is enabled
-
-bool
-ACE_Trace::is_tracing (void)
-{
-  return ACE_Trace::enable_tracing_;
-}
-
-// Enable the tracing facility.
-
-void
-ACE_Trace::start_tracing (void)
-{
-  ACE_Trace::enable_tracing_ = true;
-}
-
-// Disable the tracing facility.
-
-void
-ACE_Trace::stop_tracing (void)
-{
-  ACE_Trace::enable_tracing_ = false;
-}
-
-// Change the nesting indentation level.
-
-void
-ACE_Trace::set_nesting_indent (int indent)
-{
-  ACE_Trace::nesting_indent_ = indent;
-}
-
-// Get the nesting indentation level.
-
-int
-ACE_Trace::get_nesting_indent (void)
-{
-  return ACE_Trace::nesting_indent_;
-}
-
-// Perform the first part of the trace, which prints out the string N,
-// the LINE, and the ACE_FILE as the function is entered.
-
-ACE_Trace::ACE_Trace (const ACE_TCHAR *n,
-                      int line,
-                      const ACE_TCHAR *file)
-{
-#if defined (ACE_NLOGGING)
-  ACE_UNUSED_ARG (line);
-  ACE_UNUSED_ARG (file);
-#endif /* ACE_NLOGGING */
-
-  this->name_ = n;
-
-  // If ACE has not yet been initialized, don't try to trace... there's
-  // too much stuff not yet initialized.
-  if (ACE_Trace::enable_tracing_ && !ACE_OS_Object_Manager::starting_up ())
-    {
-      ACE_Log_Msg *lm = ACE_LOG_MSG;
-      if (lm->tracing_enabled ()
-          && lm->trace_active () == 0)
-        {
-          lm->trace_active (1);
-          ACE_DEBUG ((LM_TRACE,
-                      ACE_TEXT ("%*s(%t) calling %s in file `%s' on line %d\n"),
-                      ACE_Trace::nesting_indent_ * lm->inc (),
-                      ACE_TEXT (""),
-                      this->name_,
-                      file,
-                      line));
-          lm->trace_active (0);
-        }
-    }
-}
-
-// Perform the second part of the trace, which prints out the NAME as
-// the function is exited.
-
-ACE_Trace::~ACE_Trace (void)
-{
-  // If ACE has not yet been initialized, don't try to trace... there's
-  // too much stuff not yet initialized.
-  if (ACE_Trace::enable_tracing_ && !ACE_OS_Object_Manager::starting_up ())
-    {
-      ACE_Log_Msg *lm = ACE_LOG_MSG;
-      if (lm->tracing_enabled ()
-          && lm->trace_active () == 0)
-        {
-          lm->trace_active (1);
-          ACE_DEBUG ((LM_TRACE,
-                      ACE_TEXT ("%*s(%t) leaving %s\n"),
-                      ACE_Trace::nesting_indent_ * lm->dec (),
-                      ACE_TEXT (""),
-                      this->name_));
-          lm->trace_active (0);
-        }
-    }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL