*Merge.

--HG--
branch : trunk

7 files changed, 7 insertions, 0 deletions

diff --git a/src/shared/Config/Config.cpp b/src/shared/Config/Config.cpp
index b3a3b13d652..52fca953f64 100644
--- a/src/shared/Config/Config.cpp
+++ b/src/shared/Config/Config.cpp
@@ -174,3 +174,4 @@ float Config::GetFloatDefault(const char* name, const float def)
     float val;
     return (GetFloat(name, &val) ? val : def);
 }
+
diff --git a/src/shared/Config/Config.h b/src/shared/Config/Config.h
index 424c369bd92..2c709f02ae5 100644
--- a/src/shared/Config/Config.h
+++ b/src/shared/Config/Config.h
@@ -58,3 +58,4 @@ class TRINITY_DLL_SPEC Config
 #define sConfig Trinity::Singleton<Config>::Instance()
 
 #endif
+
diff --git a/src/shared/Config/ConfigEnv.h b/src/shared/Config/ConfigEnv.h
index 6c3a54a45fc..75209a7fc6b 100644
--- a/src/shared/Config/ConfigEnv.h
+++ b/src/shared/Config/ConfigEnv.h
@@ -27,3 +27,4 @@
 #include "Config.h"
 
 #endif
+
diff --git a/src/shared/Config/dotconfpp/dotconfpp.cpp b/src/shared/Config/dotconfpp/dotconfpp.cpp
index c46b1fe6fb9..bd575d95ece 100644
--- a/src/shared/Config/dotconfpp/dotconfpp.cpp
+++ b/src/shared/Config/dotconfpp/dotconfpp.cpp
@@ -586,3 +586,4 @@ void DOTCONFDocument::setRequiredOptionNames(const char ** requiredOptionNames)
         ++requiredOptionNames;
     }
 }
+
diff --git a/src/shared/Config/dotconfpp/dotconfpp.h b/src/shared/Config/dotconfpp/dotconfpp.h
index 15c4f7fcd78..7887f86ccc1 100644
--- a/src/shared/Config/dotconfpp/dotconfpp.h
+++ b/src/shared/Config/dotconfpp/dotconfpp.h
@@ -108,3 +108,4 @@ public:
 };
 
 #endif
+
diff --git a/src/shared/Config/dotconfpp/mempool.cpp b/src/shared/Config/dotconfpp/mempool.cpp
index cf589ffb2bc..487dae0bd0a 100644
--- a/src/shared/Config/dotconfpp/mempool.cpp
+++ b/src/shared/Config/dotconfpp/mempool.cpp
@@ -98,3 +98,4 @@ char * AsyncDNSMemPool::strdup(const char *str)
 {
     return ::strcpy((char*)this->alloc(strlen(str)+1), str);
 }
+
diff --git a/src/shared/Config/dotconfpp/mempool.h b/src/shared/Config/dotconfpp/mempool.h
index 04bd1e006ad..81c01d15a58 100644
--- a/src/shared/Config/dotconfpp/mempool.h
+++ b/src/shared/Config/dotconfpp/mempool.h
@@ -44,3 +44,4 @@ public:
 };
 
 #endif
+