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

diff --git a/dep/acelite/ace/Profile_Timer.h b/dep/acelite/ace/Profile_Timer.h
deleted file mode 100644
index e21c397969b..00000000000
--- a/dep/acelite/ace/Profile_Timer.h
+++ /dev/null
@@ -1,139 +0,0 @@
-// -*- C++ -*-
-
-//==========================================================================
-/**
- *  @file    Profile_Timer.h
- *
- *  $Id: Profile_Timer.h 93359 2011-02-11 11:33:12Z mcorino $
- *
- *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
- */
-//==========================================================================
-
-
-#ifndef ACE_PROFILE_TIMER_H
-#define ACE_PROFILE_TIMER_H
-#include /**/ "ace/pre.h"
-
-#include /**/ "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/High_Res_Timer.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ACE_Profile_Timer
- *
- * @brief This class provides both a timing mechanism and a mechanism
- * for reporting the resource usage of a process.
- */
-class ACE_Export ACE_Profile_Timer
-{
-public:
-
-  /**
-   * @class ACE_Elapsed_Time
-   *
-   * @brief Keeps track of the various user, system, and elapsed (real)
-   * times.
-   */
-  class ACE_Elapsed_Time
-  {
-  public:
-    /// Elapsed wall clock time.
-    ACE_timer_t real_time;
-
-    /// CPU time spent in user space.
-    ACE_timer_t user_time;
-
-    /// CPU time spent in system space.
-    ACE_timer_t system_time;
-  };
-
-  typedef ACE_Rusage Rusage;
-
-  // = Initialization and termination methods.
-  /// Default constructor. Clears all time values to 0.
-  ACE_Profile_Timer (void);
-
-  /// Shutdown the timer.
-  ~ACE_Profile_Timer (void);
-
-  // = Timer methods.
-  /// Activate the timer.
-  int start (void);
-
-  /// Stop the timer.
-  int stop (void);
-
-  // = Resource utilization methods.
-  /// Compute the time elapsed between calls to @c start() and @c stop().
-  int elapsed_time (ACE_Elapsed_Time &et);
-
-  /// Compute the amount of resource utilization between calls to @c start()
-  /// and @c stop().
-  void elapsed_rusage (ACE_Profile_Timer::Rusage &rusage);
-
-  /// Return the resource utilization (don't recompute it).
-  void get_rusage (ACE_Profile_Timer::Rusage &rusage);
-
-  /// Dump the state of an object.
-  void dump (void) const;
-
-  /// Declare the dynamic allocation hooks.
-  ACE_ALLOC_HOOK_DECLARE;
-
-private:
-  /// Compute how much time has elapsed.
-  void compute_times (ACE_Elapsed_Time &et);
-
-  /// Keep track of the starting resource utilization.
-  ACE_Profile_Timer::Rusage begin_usage_;
-
-  /// Keep track of the ending resource utilization.
-  ACE_Profile_Timer::Rusage end_usage_;
-
-  /// Keep track of the last rusage for incremental timing.
-  ACE_Profile_Timer::Rusage last_usage_;
-
-#if defined (ACE_HAS_PRUSAGE_T)
-  /// Subtract two timestructs and store their difference.
-  void subtract (timespec_t &tdiff, timespec_t &t0, timespec_t &t1);
-
-  /// I/O handle for /proc file system.
-  ACE_HANDLE proc_handle_;
-
-#elif defined (ACE_HAS_GETRUSAGE)
-  /// Subtract two timestructs and store their difference.
-  void subtract (timeval &tdiff,
-                 timeval &t0,
-                 timeval &t1);
-
-  /// Keep track of the beginning time.
-  timeval begin_time_;
-
-  /// Keep track of the ending time.
-  timeval end_time_;
-
-  /// Keep track of the last time for incremental timing.
-  timeval last_time_;
-#endif /* ACE_HAS_PRUSAGE_T */
-
-#if defined (ACE_WIN32) || (!defined (ACE_HAS_PRUSAGE_T) && !defined (ACE_HAS_GETRUSAGE))
-  /// The high resolution timer
-  ACE_High_Res_Timer timer_;
-#endif /* ACE_WIN32 || !ACE_HAS_PRUSAGE_T && !ACE_HAS_GETRUSAGE */
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "ace/Profile_Timer.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_PROFILE_TIMER_H */