*Merge.

--HG--
branch : trunk

100 files changed, 99 insertions, 1 deletions

diff --git a/src/shared/Auth/AuthCrypt.cpp b/src/shared/Auth/AuthCrypt.cpp
index 2d8bd824fd1..0b2a3f64338 100644
--- a/src/shared/Auth/AuthCrypt.cpp
+++ b/src/shared/Auth/AuthCrypt.cpp
@@ -80,3 +80,4 @@ void AuthCrypt::GenerateKey(uint8 *key, BigNumber *bn)
     hash.Finalize();
     memcpy(key, hash.GetDigest(), SHA_DIGEST_LENGTH);
 }
+
diff --git a/src/shared/Auth/AuthCrypt.h b/src/shared/Auth/AuthCrypt.h
index 7a0b0a4d219..5c35511ad9f 100644
--- a/src/shared/Auth/AuthCrypt.h
+++ b/src/shared/Auth/AuthCrypt.h
@@ -51,3 +51,4 @@ class AuthCrypt
         bool _initialized;
 };
 #endif
+
diff --git a/src/shared/Auth/BigNumber.cpp b/src/shared/Auth/BigNumber.cpp
index becbe44c0ed..7872b141f3d 100644
--- a/src/shared/Auth/BigNumber.cpp
+++ b/src/shared/Auth/BigNumber.cpp
@@ -207,3 +207,4 @@ const char *BigNumber::AsDecStr()
 {
     return BN_bn2dec(_bn);
 }
+
diff --git a/src/shared/Auth/BigNumber.h b/src/shared/Auth/BigNumber.h
index 9ce18ea3047..b9038e86b13 100644
--- a/src/shared/Auth/BigNumber.h
+++ b/src/shared/Auth/BigNumber.h
@@ -94,3 +94,4 @@ class BigNumber
         uint8 *_array;
 };
 #endif
+
diff --git a/src/shared/Auth/Hmac.cpp b/src/shared/Auth/Hmac.cpp
index 5f97ee65cc2..a8572f0e9f8 100644
--- a/src/shared/Auth/Hmac.cpp
+++ b/src/shared/Auth/Hmac.cpp
@@ -56,3 +56,4 @@ void HmacHash::Finalize()
     HMAC_Final(&m_ctx, m_digest, &length);
     ASSERT(length == SHA_DIGEST_LENGTH)
 }
+
diff --git a/src/shared/Auth/Hmac.h b/src/shared/Auth/Hmac.h
index b8ab30f2dc7..fc80bdca4c4 100644
--- a/src/shared/Auth/Hmac.h
+++ b/src/shared/Auth/Hmac.h
@@ -46,3 +46,4 @@ class HmacHash
         uint8 m_digest[SHA_DIGEST_LENGTH];
 };
 #endif
+
diff --git a/src/shared/Auth/Sha1.cpp b/src/shared/Auth/Sha1.cpp
index f367c2919b3..8743a14b838 100644
--- a/src/shared/Auth/Sha1.cpp
+++ b/src/shared/Auth/Sha1.cpp
@@ -65,3 +65,4 @@ void Sha1Hash::Finalize(void)
 {
     SHA1_Final(mDigest, &mC);
 }
+
diff --git a/src/shared/Auth/Sha1.h b/src/shared/Auth/Sha1.h
index 811ccc2053a..68c61eb7a8e 100644
--- a/src/shared/Auth/Sha1.h
+++ b/src/shared/Auth/Sha1.h
@@ -51,3 +51,4 @@ class Sha1Hash
         uint8 mDigest[SHA_DIGEST_LENGTH];
 };
 #endif
+
diff --git a/src/shared/Auth/md5.h b/src/shared/Auth/md5.h
index fa2937e13e4..0463051b6a6 100644
--- a/src/shared/Auth/md5.h
+++ b/src/shared/Auth/md5.h
@@ -89,3 +89,4 @@ extern "C"
 }                                                           /* end extern "C" */
 #endif
 #endif                                                      /* md5_INCLUDED */
+
diff --git a/src/shared/Base.cpp b/src/shared/Base.cpp
index 9929cd41fdf..ca5094810d6 100644
--- a/src/shared/Base.cpp
+++ b/src/shared/Base.cpp
@@ -65,3 +65,4 @@ int Base::GetRefCount ()
 {
     return RefCount;
 }
+
diff --git a/src/shared/Base.h b/src/shared/Base.h
index d5907fdf473..e14ea6b27b9 100644
--- a/src/shared/Base.h
+++ b/src/shared/Base.h
@@ -52,3 +52,4 @@ class Base
 
 };
 #endif                                                      // __BASE_H__
+
diff --git a/src/shared/ByteBuffer.h b/src/shared/ByteBuffer.h
index 2dd01e8a022..97b6c1cbd17 100644
--- a/src/shared/ByteBuffer.h
+++ b/src/shared/ByteBuffer.h
@@ -505,3 +505,4 @@ template <typename K, typename V> ByteBuffer &operator>>(ByteBuffer &b, std::map
     return b;
 }
 #endif
+
diff --git a/src/shared/Common.cpp b/src/shared/Common.cpp
index e70dc8358c2..27ae9184d69 100644
--- a/src/shared/Common.cpp
+++ b/src/shared/Common.cpp
@@ -40,3 +40,4 @@ LocaleConstant GetLocaleByName(const std::string& name)
 
     return LOCALE_enUS;                                     // including enGB case
 }
+
diff --git a/src/shared/Common.h b/src/shared/Common.h
index a0884a8455e..9f5b9473bd9 100644
--- a/src/shared/Common.h
+++ b/src/shared/Common.h
@@ -208,3 +208,4 @@ LocaleConstant GetLocaleByName(const std::string& name);
 #endif
 
 #endif
+
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
+
diff --git a/src/shared/Database/DBCEnums.h b/src/shared/Database/DBCEnums.h
index e546b1f7828..ee4f165f898 100644
--- a/src/shared/Database/DBCEnums.h
+++ b/src/shared/Database/DBCEnums.h
@@ -321,3 +321,4 @@ enum SummonFlags
 };
 */
 #endif
+
diff --git a/src/shared/Database/DBCStores.cpp b/src/shared/Database/DBCStores.cpp
index 6e49a344b1a..8890ad0eb1e 100644
--- a/src/shared/Database/DBCStores.cpp
+++ b/src/shared/Database/DBCStores.cpp
@@ -709,3 +709,4 @@ uint32 const* GetTalentTabPages(uint32 cls)
 TRINITY_DLL_SPEC DBCStorage <SoundEntriesEntry>  const* GetSoundEntriesStore()   { return &sSoundEntriesStore;   }
 TRINITY_DLL_SPEC DBCStorage <SpellEntry>         const* GetSpellStore()          { return &sSpellStore;          }
 TRINITY_DLL_SPEC DBCStorage <SpellRangeEntry>    const* GetSpellRangeStore()     { return &sSpellRangeStore;     }
+
diff --git a/src/shared/Database/DBCStores.h b/src/shared/Database/DBCStores.h
index 4a67164a773..8a7ee02cc95 100644
--- a/src/shared/Database/DBCStores.h
+++ b/src/shared/Database/DBCStores.h
@@ -221,3 +221,4 @@ TRINITY_DLL_SPEC DBCStorage <SoundEntriesEntry>  const* GetSoundEntriesStore();
 TRINITY_DLL_SPEC DBCStorage <SpellEntry>         const* GetSpellStore();
 TRINITY_DLL_SPEC DBCStorage <SpellRangeEntry>    const* GetSpellRangeStore();
 #endif
+
diff --git a/src/shared/Database/DBCStructure.h b/src/shared/Database/DBCStructure.h
index 4be24d9e24b..975dbf300f1 100644
--- a/src/shared/Database/DBCStructure.h
+++ b/src/shared/Database/DBCStructure.h
@@ -1578,3 +1578,4 @@ typedef std::vector<TaxiPathNodeList> TaxiPathNodesByPath;
 #define TaxiMaskSize 12
 typedef uint32 TaxiMask[TaxiMaskSize];
 #endif
+
diff --git a/src/shared/Database/Database.cpp b/src/shared/Database/Database.cpp
index 5d7f5bf473e..07ece3b0cd9 100644
--- a/src/shared/Database/Database.cpp
+++ b/src/shared/Database/Database.cpp
@@ -171,3 +171,4 @@ bool Database::DirectPExecute(const char * format,...)
 
     return DirectExecute(szQuery);
 }
+
diff --git a/src/shared/Database/Database.h b/src/shared/Database/Database.h
index beff0fb740a..92a1c991dcc 100644
--- a/src/shared/Database/Database.h
+++ b/src/shared/Database/Database.h
@@ -135,3 +135,4 @@ class TRINITY_DLL_SPEC Database
         std::string m_logsDir;
 };
 #endif
+
diff --git a/src/shared/Database/DatabaseEnv.h b/src/shared/Database/DatabaseEnv.h
index df1f51adbe7..9366d1e0070 100644
--- a/src/shared/Database/DatabaseEnv.h
+++ b/src/shared/Database/DatabaseEnv.h
@@ -56,3 +56,4 @@ extern DatabaseType CharacterDatabase;
 extern DatabaseType LoginDatabase;
 
 #endif
+
diff --git a/src/shared/Database/DatabaseImpl.h b/src/shared/Database/DatabaseImpl.h
index c9a02a0a4a1..3d3c53f0873 100644
--- a/src/shared/Database/DatabaseImpl.h
+++ b/src/shared/Database/DatabaseImpl.h
@@ -205,3 +205,4 @@ Database::DelayQueryHolder(Class *object, void (Class::*method)(QueryResult*, Sq
 #undef ASYNC_QUERY_BODY
 #undef ASYNC_PQUERY_BODY
 #undef ASYNC_DELAYHOLDER_BODY
+
diff --git a/src/shared/Database/DatabaseMysql.cpp b/src/shared/Database/DatabaseMysql.cpp
index 7e67861d883..e7babedddfe 100644
--- a/src/shared/Database/DatabaseMysql.cpp
+++ b/src/shared/Database/DatabaseMysql.cpp
@@ -408,3 +408,4 @@ void DatabaseMysql::HaltDelayThread()
     m_threadBody = NULL;
 }
 #endif
+
diff --git a/src/shared/Database/DatabaseMysql.h b/src/shared/Database/DatabaseMysql.h
index 6dbaf4a59ab..2fa157e75a5 100644
--- a/src/shared/Database/DatabaseMysql.h
+++ b/src/shared/Database/DatabaseMysql.h
@@ -77,3 +77,4 @@ class TRINITY_DLL_SPEC DatabaseMysql : public Database
 };
 #endif
 #endif
+
diff --git a/src/shared/Database/DatabasePostgre.cpp b/src/shared/Database/DatabasePostgre.cpp
index 8f8cf95b429..502808b7933 100644
--- a/src/shared/Database/DatabasePostgre.cpp
+++ b/src/shared/Database/DatabasePostgre.cpp
@@ -345,3 +345,4 @@ void DatabasePostgre::HaltDelayThread()
     m_threadBody = NULL;
 }
 #endif
+
diff --git a/src/shared/Database/DatabasePostgre.h b/src/shared/Database/DatabasePostgre.h
index 9a2aeb84a07..c7242add572 100644
--- a/src/shared/Database/DatabasePostgre.h
+++ b/src/shared/Database/DatabasePostgre.h
@@ -75,3 +75,4 @@ class DatabasePostgre : public Database
         bool _TransactionCmd(const char *sql);
 };
 #endif
+
diff --git a/src/shared/Database/DatabaseSqlite.cpp b/src/shared/Database/DatabaseSqlite.cpp
index a3fffd8aa4c..b5def933723 100644
--- a/src/shared/Database/DatabaseSqlite.cpp
+++ b/src/shared/Database/DatabaseSqlite.cpp
@@ -101,3 +101,4 @@ bool DatabaseSqlite::Execute(const char *sql)
     return true;
 }
 #endif
+
diff --git a/src/shared/Database/DatabaseSqlite.h b/src/shared/Database/DatabaseSqlite.h
index a9593989143..c84b59eea80 100644
--- a/src/shared/Database/DatabaseSqlite.h
+++ b/src/shared/Database/DatabaseSqlite.h
@@ -43,3 +43,4 @@ class DatabaseSqlite : public Database
 };
 #endif
 #endif
+
diff --git a/src/shared/Database/Field.cpp b/src/shared/Database/Field.cpp
index 18831e23687..9a1fbfa5178 100644
--- a/src/shared/Database/Field.cpp
+++ b/src/shared/Database/Field.cpp
@@ -65,3 +65,4 @@ void Field::SetValue(const char *value)
     else
         mValue = NULL;
 }
+
diff --git a/src/shared/Database/Field.h b/src/shared/Database/Field.h
index a4514c963cd..da6a865c6f2 100644
--- a/src/shared/Database/Field.h
+++ b/src/shared/Database/Field.h
@@ -75,3 +75,4 @@ class Field
         enum DataTypes mType;
 };
 #endif
+
diff --git a/src/shared/Database/MySQLDelayThread.h b/src/shared/Database/MySQLDelayThread.h
index 5f3e66de722..fcebe3fbd35 100644
--- a/src/shared/Database/MySQLDelayThread.h
+++ b/src/shared/Database/MySQLDelayThread.h
@@ -30,3 +30,4 @@ class MySQLDelayThread : public SqlDelayThread
         void Stop() { SqlDelayThread::Stop(); }
 };
 #endif                                                      //__MYSQLDELAYTHREAD_H
+
diff --git a/src/shared/Database/PGSQLDelayThread.h b/src/shared/Database/PGSQLDelayThread.h
index bd6a2bf962d..8d219bd9c1e 100644
--- a/src/shared/Database/PGSQLDelayThread.h
+++ b/src/shared/Database/PGSQLDelayThread.h
@@ -30,3 +30,4 @@ class PGSQLDelayThread : public SqlDelayThread
         void Stop() { SqlDelayThread::Stop(); }
 };
 #endif                                                      //__PGSQLDELAYTHREAD_H
+
diff --git a/src/shared/Database/QueryResult.h b/src/shared/Database/QueryResult.h
index 0fab7a3633b..01da45ed281 100644
--- a/src/shared/Database/QueryResult.h
+++ b/src/shared/Database/QueryResult.h
@@ -64,3 +64,4 @@ class TRINITY_DLL_SPEC QueryResult
         FieldNames mFieldNames;
 };
 #endif
+
diff --git a/src/shared/Database/QueryResultMysql.cpp b/src/shared/Database/QueryResultMysql.cpp
index 8ae59b350d8..5bc11ae308f 100644
--- a/src/shared/Database/QueryResultMysql.cpp
+++ b/src/shared/Database/QueryResultMysql.cpp
@@ -110,3 +110,4 @@ enum Field::DataTypes QueryResultMysql::ConvertNativeType(enum_field_types mysql
     }
 }
 #endif
+
diff --git a/src/shared/Database/QueryResultMysql.h b/src/shared/Database/QueryResultMysql.h
index 39d2985ad77..06b1353c12e 100644
--- a/src/shared/Database/QueryResultMysql.h
+++ b/src/shared/Database/QueryResultMysql.h
@@ -48,3 +48,4 @@ class QueryResultMysql : public QueryResult
 };
 #endif
 #endif
+
diff --git a/src/shared/Database/QueryResultPostgre.cpp b/src/shared/Database/QueryResultPostgre.cpp
index e10905f0feb..500ca053885 100644
--- a/src/shared/Database/QueryResultPostgre.cpp
+++ b/src/shared/Database/QueryResultPostgre.cpp
@@ -139,3 +139,4 @@ enum Field::DataTypes QueryResultPostgre::ConvertNativeType(Oid  pOid ) const
     return Field::DB_TYPE_UNKNOWN;
 }
 #endif
+
diff --git a/src/shared/Database/QueryResultPostgre.h b/src/shared/Database/QueryResultPostgre.h
index aa183ab4b96..30d69114dc6 100644
--- a/src/shared/Database/QueryResultPostgre.h
+++ b/src/shared/Database/QueryResultPostgre.h
@@ -48,3 +48,4 @@ class QueryResultPostgre : public QueryResult
         uint32 mTableIndex;
 };
 #endif
+
diff --git a/src/shared/Database/QueryResultSqlite.cpp b/src/shared/Database/QueryResultSqlite.cpp
index 9a32e36bc84..06a02d1db59 100644
--- a/src/shared/Database/QueryResultSqlite.cpp
+++ b/src/shared/Database/QueryResultSqlite.cpp
@@ -96,3 +96,4 @@ enum Field::DataTypes QueryResultSqlite::ConvertNativeType(const char* sqliteTyp
     return Field::DB_TYPE_UNKNOWN;
 }
 #endif
+
diff --git a/src/shared/Database/QueryResultSqlite.h b/src/shared/Database/QueryResultSqlite.h
index d3462977e49..5dc3287b385 100644
--- a/src/shared/Database/QueryResultSqlite.h
+++ b/src/shared/Database/QueryResultSqlite.h
@@ -43,3 +43,4 @@ class QueryResultSqlite : public QueryResult
 };
 #endif
 #endif
+
diff --git a/src/shared/Database/SQLStorage.cpp b/src/shared/Database/SQLStorage.cpp
index 2f4f4534b3a..2401f715074 100644
--- a/src/shared/Database/SQLStorage.cpp
+++ b/src/shared/Database/SQLStorage.cpp
@@ -81,3 +81,4 @@ void SQLStorage::Load()
     SQLStorageLoader loader;
     loader.Load(*this);
 }
+
diff --git a/src/shared/Database/SQLStorage.h b/src/shared/Database/SQLStorage.h
index f2250410c26..1b5b9d5dcf1 100644
--- a/src/shared/Database/SQLStorage.h
+++ b/src/shared/Database/SQLStorage.h
@@ -114,3 +114,4 @@ struct SQLStorageLoader : public SQLStorageLoaderBase<SQLStorageLoader>
 };
 
 #endif
+
diff --git a/src/shared/Database/SQLStorageImpl.h b/src/shared/Database/SQLStorageImpl.h
index b820d68619b..6cb67832f02 100644
--- a/src/shared/Database/SQLStorageImpl.h
+++ b/src/shared/Database/SQLStorageImpl.h
@@ -212,3 +212,4 @@ void SQLStorageLoaderBase<T>::Load(SQLStorage &store)
     store.MaxEntry = maxi;
     store.data = _data;
 }
+
diff --git a/src/shared/Database/SqlDelayThread.cpp b/src/shared/Database/SqlDelayThread.cpp
index a35090adb7e..27f58510a0a 100644
--- a/src/shared/Database/SqlDelayThread.cpp
+++ b/src/shared/Database/SqlDelayThread.cpp
@@ -55,3 +55,4 @@ void SqlDelayThread::Stop()
 {
     m_running = false;
 }
+
diff --git a/src/shared/Database/SqlDelayThread.h b/src/shared/Database/SqlDelayThread.h
index 1fc35741fc5..cbae0c1e5eb 100644
--- a/src/shared/Database/SqlDelayThread.h
+++ b/src/shared/Database/SqlDelayThread.h
@@ -48,3 +48,4 @@ class SqlDelayThread : public ZThread::Runnable
         virtual void run();                                 ///< Main Thread loop
 };
 #endif                                                      //__SQLDELAYTHREAD_H
+
diff --git a/src/shared/Database/SqlOperations.cpp b/src/shared/Database/SqlOperations.cpp
index 233eed1e4cb..68f5759a85e 100644
--- a/src/shared/Database/SqlOperations.cpp
+++ b/src/shared/Database/SqlOperations.cpp
@@ -199,3 +199,4 @@ void SqlQueryHolderEx::Execute(Database *db)
     /// sync with the caller thread
     m_queue->add(m_callback);
 }
+
diff --git a/src/shared/Database/SqlOperations.h b/src/shared/Database/SqlOperations.h
index b7c84b5d6cf..61eef4bb7c4 100644
--- a/src/shared/Database/SqlOperations.h
+++ b/src/shared/Database/SqlOperations.h
@@ -121,3 +121,4 @@ class SqlQueryHolderEx : public SqlOperation
         void Execute(Database *db);
 };
 #endif                                                      //__SQLOPERATIONS_H
+
diff --git a/src/shared/Database/dbcfile.cpp b/src/shared/Database/dbcfile.cpp
index f0b7e6e3c15..c40c8b223e1 100644
--- a/src/shared/Database/dbcfile.cpp
+++ b/src/shared/Database/dbcfile.cpp
@@ -243,3 +243,4 @@ char* DBCFile::AutoProduceStrings(const char* format, char* dataTable)
 
     return stringPool;
 }
+
diff --git a/src/shared/Database/dbcfile.h b/src/shared/Database/dbcfile.h
index 470322326aa..e94417b4371 100644
--- a/src/shared/Database/dbcfile.h
+++ b/src/shared/Database/dbcfile.h
@@ -107,3 +107,4 @@ class DBCFile
         unsigned char *stringTable;
 };
 #endif
+
diff --git a/src/shared/Errors.h b/src/shared/Errors.h
index a521ae7f3f0..b7bd19a1d94 100644
--- a/src/shared/Errors.h
+++ b/src/shared/Errors.h
@@ -29,3 +29,4 @@
 
 #define ASSERT WPAssert
 #endif
+
diff --git a/src/shared/Log.cpp b/src/shared/Log.cpp
index 2ed66ae3189..c0f70f4790b 100644
--- a/src/shared/Log.cpp
+++ b/src/shared/Log.cpp
@@ -796,3 +796,4 @@ void error_db_log(const char * str, ...)
 
     Trinity::Singleton<Log>::Instance().outErrorDb(buf);
 }
+
diff --git a/src/shared/Log.h b/src/shared/Log.h
index 076d660be61..b4344eac262 100644
--- a/src/shared/Log.h
+++ b/src/shared/Log.h
@@ -165,3 +165,4 @@ void TRINITY_DLL_SPEC debug_log(const char * str, ...) ATTR_PRINTF(1,2);
 void TRINITY_DLL_SPEC error_log(const char * str, ...) ATTR_PRINTF(1,2);
 void TRINITY_DLL_SPEC error_db_log(const char * str, ...) ATTR_PRINTF(1,2);
 #endif
+
diff --git a/src/shared/Mthread.cpp b/src/shared/Mthread.cpp
index 8985b9cebc8..fbbeeb5a620 100644
--- a/src/shared/Mthread.cpp
+++ b/src/shared/Mthread.cpp
@@ -203,3 +203,4 @@ MMutex *MMutex::Create ()
     return mutex;
 }
 #endif
+
diff --git a/src/shared/Mthread.h b/src/shared/Mthread.h
index 1afee4acd1b..d0ac6deb43c 100644
--- a/src/shared/Mthread.h
+++ b/src/shared/Mthread.h
@@ -60,3 +60,4 @@ class MMutex :  public Base
         virtual void Unlock ();
 };
 #endif                                                      // MTHREAD_H
+
diff --git a/src/shared/PacketLog.cpp b/src/shared/PacketLog.cpp
index 2fcd6c58b9b..96c9727e7fa 100644
--- a/src/shared/PacketLog.cpp
+++ b/src/shared/PacketLog.cpp
@@ -157,3 +157,4 @@ void PacketLog::WorldHexDump(WorldPacket* data, uint32 socket, bool direction)
     HexDump((char *)data->contents(), data->size(), "world.log");
 
 }
+
diff --git a/src/shared/PacketLog.h b/src/shared/PacketLog.h
index b4313c48624..49ac72ebc4b 100644
--- a/src/shared/PacketLog.h
+++ b/src/shared/PacketLog.h
@@ -46,3 +46,4 @@ class PacketLog
 
 #define sPacketLog Trinity::Singleton<PacketLog>::Instance()
 #endif
+
diff --git a/src/shared/ProgressBar.cpp b/src/shared/ProgressBar.cpp
index 0108dfec974..b72118ad804 100644
--- a/src/shared/ProgressBar.cpp
+++ b/src/shared/ProgressBar.cpp
@@ -80,3 +80,4 @@ void barGoLink::step( void )
         rec_pos = n;
     }
 }
+
diff --git a/src/shared/ProgressBar.h b/src/shared/ProgressBar.h
index 8c551ed65dc..50c5c7d11e5 100644
--- a/src/shared/ProgressBar.h
+++ b/src/shared/ProgressBar.h
@@ -40,3 +40,4 @@ class TRINITY_DLL_SPEC barGoLink
         ~barGoLink();
 };
 #endif
+
diff --git a/src/shared/ServiceWin32.cpp b/src/shared/ServiceWin32.cpp
index 878656b1d91..bdc2a371297 100644
--- a/src/shared/ServiceWin32.cpp
+++ b/src/shared/ServiceWin32.cpp
@@ -260,3 +260,4 @@ bool WinServiceRun()
     return true;
 }
 #endif
+
diff --git a/src/shared/ServiceWin32.h b/src/shared/ServiceWin32.h
index 762502ccaa7..18a52c396ea 100644
--- a/src/shared/ServiceWin32.h
+++ b/src/shared/ServiceWin32.h
@@ -28,3 +28,4 @@ bool WinServiceRun();
 
 #endif                                                      // _WIN32_SERVICE_
 #endif                                                      // WIN32
+
diff --git a/src/shared/SystemConfig.h b/src/shared/SystemConfig.h
index 7d0143085b4..679eee407e6 100644
--- a/src/shared/SystemConfig.h
+++ b/src/shared/SystemConfig.h
@@ -52,3 +52,4 @@
 #define DEFAULT_REALMSERVER_PORT 3724
 #define DEFAULT_SOCKET_SELECT_TIME 10000
 #endif
+
diff --git a/src/shared/Timer.h b/src/shared/Timer.h
index 30f5966afce..82f5be161d9 100644
--- a/src/shared/Timer.h
+++ b/src/shared/Timer.h
@@ -96,3 +96,4 @@ struct TimeTrackerSmall
 };
 
 #endif
+
diff --git a/src/shared/Util.cpp b/src/shared/Util.cpp
index 0d3010c5f04..36c41e5da48 100644
--- a/src/shared/Util.cpp
+++ b/src/shared/Util.cpp
@@ -425,3 +425,4 @@ bool Utf8FitTo(const std::string& str, std::wstring search)
 
     return true;
 }
+
diff --git a/src/shared/Util.h b/src/shared/Util.h
index adfbdad620a..712f100bd33 100644
--- a/src/shared/Util.h
+++ b/src/shared/Util.h
@@ -544,4 +544,3 @@ public:
         return (part[el]);
     };
 };
-#endif
diff --git a/src/shared/WheatyExceptionReport.cpp b/src/shared/WheatyExceptionReport.cpp
index 5d365639fbf..7b97edd8f5b 100644
--- a/src/shared/WheatyExceptionReport.cpp
+++ b/src/shared/WheatyExceptionReport.cpp
@@ -1013,3 +1013,4 @@ int __cdecl WheatyExceptionReport::_tprintf(const TCHAR * format, ...)
 
     return retValue;
 }
+
diff --git a/src/shared/WheatyExceptionReport.h b/src/shared/WheatyExceptionReport.h
index 896d9c72f36..32cd78fa100 100644
--- a/src/shared/WheatyExceptionReport.h
+++ b/src/shared/WheatyExceptionReport.h
@@ -115,3 +115,4 @@ class WheatyExceptionReport
 
 extern WheatyExceptionReport g_WheatyExceptionReport;       //  global instance of class
 #endif                                                      //WheatyExceptionReport
+
diff --git a/src/shared/WorldPacket.h b/src/shared/WorldPacket.h
index 4d30533d2f1..1eb3f12dd86 100644
--- a/src/shared/WorldPacket.h
+++ b/src/shared/WorldPacket.h
@@ -51,3 +51,4 @@ class WorldPacket : public ByteBuffer
         uint16 m_opcode;
 };
 #endif
+
diff --git a/src/shared/vmap/AABSPTree.h b/src/shared/vmap/AABSPTree.h
index bc33a6699d1..ff4335b6774 100644
--- a/src/shared/vmap/AABSPTree.h
+++ b/src/shared/vmap/AABSPTree.h
@@ -1618,3 +1618,4 @@ public:
 
 
 
+
diff --git a/src/shared/vmap/BaseModel.cpp b/src/shared/vmap/BaseModel.cpp
index bce9c718acd..2ffd5672218 100644
--- a/src/shared/vmap/BaseModel.cpp
+++ b/src/shared/vmap/BaseModel.cpp
@@ -95,3 +95,4 @@ namespace VMAP
     }
 
 }                                                           // VMAP
+
diff --git a/src/shared/vmap/BaseModel.h b/src/shared/vmap/BaseModel.h
index 42e277634ba..098e1d9381b 100644
--- a/src/shared/vmap/BaseModel.h
+++ b/src/shared/vmap/BaseModel.h
@@ -99,3 +99,4 @@ namespace VMAP
 
 }
 #endif                                                      /*BASEMODEL_H_*/
+
diff --git a/src/shared/vmap/CoordModelMapping.cpp b/src/shared/vmap/CoordModelMapping.cpp
index 9c7cbe58a6b..c362101ffb4 100644
--- a/src/shared/vmap/CoordModelMapping.cpp
+++ b/src/shared/vmap/CoordModelMapping.cpp
@@ -187,3 +187,4 @@ namespace VMAP
     //=================================================================
 
 }
+
diff --git a/src/shared/vmap/CoordModelMapping.h b/src/shared/vmap/CoordModelMapping.h
index 10392ca7eaf..7c89f0e8a0f 100644
--- a/src/shared/vmap/CoordModelMapping.h
+++ b/src/shared/vmap/CoordModelMapping.h
@@ -144,3 +144,4 @@ namespace VMAP
     };
 }
 #endif                                                      /*_COORDMODELMAPPING_H_*/
+
diff --git a/src/shared/vmap/DebugCmdLogger.cpp b/src/shared/vmap/DebugCmdLogger.cpp
index 26846fa5783..de656f4cfc5 100644
--- a/src/shared/vmap/DebugCmdLogger.cpp
+++ b/src/shared/vmap/DebugCmdLogger.cpp
@@ -125,3 +125,4 @@ namespace VMAP
     }
     //========================================================
 }
+
diff --git a/src/shared/vmap/DebugCmdLogger.h b/src/shared/vmap/DebugCmdLogger.h
index f0e35d377bf..5493ab6f332 100644
--- a/src/shared/vmap/DebugCmdLogger.h
+++ b/src/shared/vmap/DebugCmdLogger.h
@@ -116,3 +116,4 @@ namespace VMAP
 
 }
 #endif
+
diff --git a/src/shared/vmap/IVMapManager.h b/src/shared/vmap/IVMapManager.h
index 49f639b845e..243a15aef73 100644
--- a/src/shared/vmap/IVMapManager.h
+++ b/src/shared/vmap/IVMapManager.h
@@ -99,3 +99,4 @@ namespace VMAP
 
 }
 #endif
+
diff --git a/src/shared/vmap/ManagedModelContainer.cpp b/src/shared/vmap/ManagedModelContainer.cpp
index 34800b3b5f7..c7bfefe7179 100644
--- a/src/shared/vmap/ManagedModelContainer.cpp
+++ b/src/shared/vmap/ManagedModelContainer.cpp
@@ -35,3 +35,4 @@ namespace VMAP
     }
 
 }
+
diff --git a/src/shared/vmap/ManagedModelContainer.h b/src/shared/vmap/ManagedModelContainer.h
index 5aa6bfdf1c3..e6862f915c7 100644
--- a/src/shared/vmap/ManagedModelContainer.h
+++ b/src/shared/vmap/ManagedModelContainer.h
@@ -49,3 +49,4 @@ namespace VMAP
     //=======================================================
 }
 #endif
+
diff --git a/src/shared/vmap/ModelContainer.cpp b/src/shared/vmap/ModelContainer.cpp
index a4bc5b8aa17..4a722d2585b 100644
--- a/src/shared/vmap/ModelContainer.cpp
+++ b/src/shared/vmap/ModelContainer.cpp
@@ -375,3 +375,4 @@ namespace VMAP
     }
     //=================================================================
 }                                                           // VMAP
+
diff --git a/src/shared/vmap/ModelContainer.h b/src/shared/vmap/ModelContainer.h
index f66b11658d6..abc96261050 100644
--- a/src/shared/vmap/ModelContainer.h
+++ b/src/shared/vmap/ModelContainer.h
@@ -108,3 +108,4 @@ namespace VMAP
     void getBounds(const ModelContainer* pMc, G3D::AABox& pAABox);
 }
 #endif
+
diff --git a/src/shared/vmap/NodeValueAccess.h b/src/shared/vmap/NodeValueAccess.h
index 70bd0eeefae..54fc5ee99b6 100644
--- a/src/shared/vmap/NodeValueAccess.h
+++ b/src/shared/vmap/NodeValueAccess.h
@@ -48,3 +48,4 @@ namespace VMAP
     };
 }
 #endif
+
diff --git a/src/shared/vmap/ShortBox.h b/src/shared/vmap/ShortBox.h
index 059e59f47e6..0e98677aa9e 100644
--- a/src/shared/vmap/ShortBox.h
+++ b/src/shared/vmap/ShortBox.h
@@ -148,3 +148,4 @@ namespace VMAP
 
 }
 #endif
+
diff --git a/src/shared/vmap/ShortVector.h b/src/shared/vmap/ShortVector.h
index d02e6b4081e..5f0fb7d9fd8 100644
--- a/src/shared/vmap/ShortVector.h
+++ b/src/shared/vmap/ShortVector.h
@@ -134,3 +134,4 @@ namespace VMAP
     };
 }
 #endif
+
diff --git a/src/shared/vmap/SubModel.cpp b/src/shared/vmap/SubModel.cpp
index ed586ce6b52..370c80062d6 100644
--- a/src/shared/vmap/SubModel.cpp
+++ b/src/shared/vmap/SubModel.cpp
@@ -248,3 +248,4 @@ namespace VMAP
     //==========================================================
 
 }
+
diff --git a/src/shared/vmap/SubModel.h b/src/shared/vmap/SubModel.h
index 5a0b0d38be7..89ea9b91d7b 100644
--- a/src/shared/vmap/SubModel.h
+++ b/src/shared/vmap/SubModel.h
@@ -102,3 +102,4 @@ namespace VMAP
     //====================================
 }                                                           // VMAP
 #endif
+
diff --git a/src/shared/vmap/TileAssembler.cpp b/src/shared/vmap/TileAssembler.cpp
index e57836a6f9e..64d67205f68 100644
--- a/src/shared/vmap/TileAssembler.cpp
+++ b/src/shared/vmap/TileAssembler.cpp
@@ -570,3 +570,4 @@ namespace VMAP
                 //==========================================
 
             }                                               // VMAP
+
diff --git a/src/shared/vmap/TileAssembler.h b/src/shared/vmap/TileAssembler.h
index cdfd6e1311d..d2183794a9e 100644
--- a/src/shared/vmap/TileAssembler.h
+++ b/src/shared/vmap/TileAssembler.h
@@ -93,3 +93,4 @@ namespace VMAP
     //===============================================
 }                                                           // VMAP
 #endif                                                      /*_TILEASSEMBLER_H_*/
+
diff --git a/src/shared/vmap/TreeNode.cpp b/src/shared/vmap/TreeNode.cpp
index 1c0cff7d4b3..c884f9b3b1d 100644
--- a/src/shared/vmap/TreeNode.cpp
+++ b/src/shared/vmap/TreeNode.cpp
@@ -37,3 +37,4 @@ namespace VMAP
     //=================================================================
     //=================================================================
 }
+
diff --git a/src/shared/vmap/TreeNode.h b/src/shared/vmap/TreeNode.h
index d30b470b4b3..1b9532001e5 100644
--- a/src/shared/vmap/TreeNode.h
+++ b/src/shared/vmap/TreeNode.h
@@ -223,3 +223,4 @@ namespace VMAP
     };
 }
 #endif
+
diff --git a/src/shared/vmap/VMapDefinitions.h b/src/shared/vmap/VMapDefinitions.h
index 35c672bd82e..fd28a91d515 100644
--- a/src/shared/vmap/VMapDefinitions.h
+++ b/src/shared/vmap/VMapDefinitions.h
@@ -37,3 +37,4 @@ namespace VMAP
     //======================================
 }
 #endif
+
diff --git a/src/shared/vmap/VMapFactory.cpp b/src/shared/vmap/VMapFactory.cpp
index f0a78ba4f1c..5189f79daba 100644
--- a/src/shared/vmap/VMapFactory.cpp
+++ b/src/shared/vmap/VMapFactory.cpp
@@ -110,3 +110,4 @@ namespace VMAP
         }
     }
 }
+
diff --git a/src/shared/vmap/VMapFactory.h b/src/shared/vmap/VMapFactory.h
index 738a8a7f4e0..f3375d723c1 100644
--- a/src/shared/vmap/VMapFactory.h
+++ b/src/shared/vmap/VMapFactory.h
@@ -43,3 +43,4 @@ namespace VMAP
 
 }
 #endif
+
diff --git a/src/shared/vmap/VMapManager.cpp b/src/shared/vmap/VMapManager.cpp
index 9cf35b2655d..f5c2640be70 100644
--- a/src/shared/vmap/VMapManager.cpp
+++ b/src/shared/vmap/VMapManager.cpp
@@ -774,3 +774,4 @@ namespace VMAP
     //=========================================================
     //=========================================================
 }
+
diff --git a/src/shared/vmap/VMapManager.h b/src/shared/vmap/VMapManager.h
index 02e0ec3e179..bfeba3cfe67 100644
--- a/src/shared/vmap/VMapManager.h
+++ b/src/shared/vmap/VMapManager.h
@@ -173,3 +173,4 @@ namespace VMAP
     };
 }
 #endif
+
diff --git a/src/shared/vmap/VMapTools.h b/src/shared/vmap/VMapTools.h
index 5253392f867..3af3a29310d 100644
--- a/src/shared/vmap/VMapTools.h
+++ b/src/shared/vmap/VMapTools.h
@@ -150,3 +150,4 @@ namespace VMAP
     };
 }
 #endif
+