*Merge.

--HG--
branch : trunk

10 files changed, 10 insertions, 0 deletions

diff --git a/src/trinitycore/CliRunnable.cpp b/src/trinitycore/CliRunnable.cpp
index 267a8d41a27..839358e7034 100644
--- a/src/trinitycore/CliRunnable.cpp
+++ b/src/trinitycore/CliRunnable.cpp
@@ -373,3 +373,4 @@ void CliRunnable::run()
     ///- End the database thread
     WorldDatabase.ThreadEnd();                                  // free mySQL thread resources
 }
+
diff --git a/src/trinitycore/CliRunnable.h b/src/trinitycore/CliRunnable.h
index f50cae814bc..ea60ef695bc 100644
--- a/src/trinitycore/CliRunnable.h
+++ b/src/trinitycore/CliRunnable.h
@@ -33,3 +33,4 @@ class CliRunnable : public ZThread::Runnable
 };
 #endif
 /// @}
+
diff --git a/src/trinitycore/Main.cpp b/src/trinitycore/Main.cpp
index d24ae02d426..4be314d75f3 100644
--- a/src/trinitycore/Main.cpp
+++ b/src/trinitycore/Main.cpp
@@ -172,3 +172,4 @@ extern int main(int argc, char **argv)
 }
 
 /// @}
+
diff --git a/src/trinitycore/Master.cpp b/src/trinitycore/Master.cpp
index 66c1c17664e..8fd5af08800 100644
--- a/src/trinitycore/Master.cpp
+++ b/src/trinitycore/Master.cpp
@@ -518,3 +518,4 @@ void Master::_UnhookSignals()
     signal(SIGBREAK, 0);
     #endif
 }
+
diff --git a/src/trinitycore/Master.h b/src/trinitycore/Master.h
index 36d4b29495e..456202594f6 100644
--- a/src/trinitycore/Master.h
+++ b/src/trinitycore/Master.h
@@ -50,3 +50,4 @@ class Master
 #define sMaster Trinity::Singleton<Master>::Instance()
 #endif
 /// @}
+
diff --git a/src/trinitycore/RASocket.cpp b/src/trinitycore/RASocket.cpp
index cfc50d95f89..62a5dbc39c9 100644
--- a/src/trinitycore/RASocket.cpp
+++ b/src/trinitycore/RASocket.cpp
@@ -257,3 +257,4 @@ void RASocket::zprint( const char * szText )
 
     #endif
 }
+
diff --git a/src/trinitycore/RASocket.h b/src/trinitycore/RASocket.h
index a164c9d3aa2..145afd52c60 100644
--- a/src/trinitycore/RASocket.h
+++ b/src/trinitycore/RASocket.h
@@ -65,3 +65,4 @@ class RASocket: public TcpSocket
 };
 #endif
 /// @}
+
diff --git a/src/trinitycore/WorldRunnable.cpp b/src/trinitycore/WorldRunnable.cpp
index e4f1a79a6e8..73d99e66061 100644
--- a/src/trinitycore/WorldRunnable.cpp
+++ b/src/trinitycore/WorldRunnable.cpp
@@ -84,3 +84,4 @@ void WorldRunnable::run()
     ///- End the database thread
     WorldDatabase.ThreadEnd();                                  // free mySQL thread resources
 }
+
diff --git a/src/trinitycore/WorldRunnable.h b/src/trinitycore/WorldRunnable.h
index 73a7f17e52f..b84e5b6a04c 100644
--- a/src/trinitycore/WorldRunnable.h
+++ b/src/trinitycore/WorldRunnable.h
@@ -33,3 +33,4 @@ class WorldRunnable : public ZThread::Runnable
 };
 #endif
 /// @}
+
diff --git a/src/trinitycore/resource.h b/src/trinitycore/resource.h
index 7dc5cb9ef7b..fbc730320b4 100644
--- a/src/trinitycore/resource.h
+++ b/src/trinitycore/resource.h
@@ -13,3 +13,4 @@
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif
+