Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw

Conflicts:
	src/server/collision/Management/MMapManager.h

1 files changed, 2 insertions, 2 deletions

diff --git a/src/server/shared/Threading/Threading.h b/src/server/shared/Threading/Threading.h
index 3f2c121d666..00be82c6555 100644
--- a/src/server/shared/Threading/Threading.h
+++ b/src/server/shared/Threading/Threading.h
@@ -30,7 +30,7 @@ namespace ACE_Based
     class Runnable
     {
         public:
-            virtual ~Runnable() {}
+            virtual ~Runnable() { }
             virtual void run() = 0;
 
             void incReference() { ++m_refs; }
@@ -100,7 +100,7 @@ namespace ACE_Based
             typedef ACE_TSS<Thread> ThreadStorage;
             //global object - container for Thread class representation of every thread
             static ThreadStorage m_ThreadStorage;
-            //use this object to determine current OS thread priority values mapped to enum Priority{}
+            //use this object to determine current OS thread priority values mapped to enum Priority{ }
             static ThreadPriority m_TpEnum;
     };