*Merge.

--HG--
branch : trunk

12 files changed, 12 insertions, 0 deletions

diff --git a/src/framework/Utilities/ByteConverter.h b/src/framework/Utilities/ByteConverter.h
index c770be449cb..d9282c1787d 100644
--- a/src/framework/Utilities/ByteConverter.h
+++ b/src/framework/Utilities/ByteConverter.h
@@ -63,3 +63,4 @@ inline void EndianConvertReverse(uint8&) { }
 inline void EndianConvertReverse( int8&) { }
 
 #endif
+
diff --git a/src/framework/Utilities/Callback.h b/src/framework/Utilities/Callback.h
index 3b8c3e450f3..28c0931e6e7 100644
--- a/src/framework/Utilities/Callback.h
+++ b/src/framework/Utilities/Callback.h
@@ -382,3 +382,4 @@ namespace Trinity
 }
 
 #endif
+
diff --git a/src/framework/Utilities/CountedReference/Reference.h b/src/framework/Utilities/CountedReference/Reference.h
index 7954c437966..1e1083e1a66 100644
--- a/src/framework/Utilities/CountedReference/Reference.h
+++ b/src/framework/Utilities/CountedReference/Reference.h
@@ -97,3 +97,4 @@ class TRINITY_DLL_DECL Referencer
         ReferenceeHolder *i_holder;
 };
 #endif
+
diff --git a/src/framework/Utilities/CountedReference/ReferenceHolder.h b/src/framework/Utilities/CountedReference/ReferenceHolder.h
index 03edff4c7cd..4cfb7d16ded 100644
--- a/src/framework/Utilities/CountedReference/ReferenceHolder.h
+++ b/src/framework/Utilities/CountedReference/ReferenceHolder.h
@@ -39,3 +39,4 @@ struct ReferenceHolder : public THREADING_MODEL
     typedef typename THREADING_MODEL::Lock Lock;
 };
 #endif
+
diff --git a/src/framework/Utilities/CountedReference/ReferenceImpl.h b/src/framework/Utilities/CountedReference/ReferenceImpl.h
index 43a01e2bc85..c3116a21cf4 100644
--- a/src/framework/Utilities/CountedReference/ReferenceImpl.h
+++ b/src/framework/Utilities/CountedReference/ReferenceImpl.h
@@ -130,3 +130,4 @@ Referencer<T, THREADING_MODEL>::addReference(ReferenceHolder<T, THREADING_MODEL>
     ++holder->i_referenceCount;
 }
 #endif
+
diff --git a/src/framework/Utilities/EventProcessor.cpp b/src/framework/Utilities/EventProcessor.cpp
index d6e74ced42c..852f84bc4e2 100644
--- a/src/framework/Utilities/EventProcessor.cpp
+++ b/src/framework/Utilities/EventProcessor.cpp
@@ -98,3 +98,4 @@ uint64 EventProcessor::CalculateTime(uint64 t_offset)
 {
     return(m_time + t_offset);
 }
+
diff --git a/src/framework/Utilities/EventProcessor.h b/src/framework/Utilities/EventProcessor.h
index ecc7ec608be..d0a98c80e30 100644
--- a/src/framework/Utilities/EventProcessor.h
+++ b/src/framework/Utilities/EventProcessor.h
@@ -70,3 +70,4 @@ class EventProcessor
         bool m_aborting;
 };
 #endif
+
diff --git a/src/framework/Utilities/LinkedList.h b/src/framework/Utilities/LinkedList.h
index 22a80f0b9ba..171ff3601e3 100644
--- a/src/framework/Utilities/LinkedList.h
+++ b/src/framework/Utilities/LinkedList.h
@@ -246,3 +246,4 @@ class LinkedListHead
 
 //============================================
 #endif
+
diff --git a/src/framework/Utilities/LinkedReference/RefManager.h b/src/framework/Utilities/LinkedReference/RefManager.h
index bef8b32862c..ed580f49ec2 100644
--- a/src/framework/Utilities/LinkedReference/RefManager.h
+++ b/src/framework/Utilities/LinkedReference/RefManager.h
@@ -55,3 +55,4 @@ template <class TO, class FROM> class RefManager : public LinkedListHead
 
 //=====================================================
 #endif
+
diff --git a/src/framework/Utilities/LinkedReference/Reference.h b/src/framework/Utilities/LinkedReference/Reference.h
index 5ca167a3948..c77d3a2cbdb 100644
--- a/src/framework/Utilities/LinkedReference/Reference.h
+++ b/src/framework/Utilities/LinkedReference/Reference.h
@@ -91,3 +91,4 @@ template <class TO, class FROM> class Reference : public LinkedListElement
 
 //=====================================================
 #endif
+
diff --git a/src/framework/Utilities/TypeList.h b/src/framework/Utilities/TypeList.h
index fc9f869aa2b..07b1ebad3e6 100644
--- a/src/framework/Utilities/TypeList.h
+++ b/src/framework/Utilities/TypeList.h
@@ -43,3 +43,4 @@ struct TypeList
 #define TYPELIST_4(T1, T2, T3, T4)      TypeList<T1, TYPELIST_3(T2, T3, T4) >
 #define TYPELIST_5(T1, T2, T3, T4, T5)  TypeList<T1, TYPELIST_4(T2, T3, T4, T5) >
 #endif
+
diff --git a/src/framework/Utilities/UnorderedMap.h b/src/framework/Utilities/UnorderedMap.h
index 13f9d58619b..dd539cc0bda 100644
--- a/src/framework/Utilities/UnorderedMap.h
+++ b/src/framework/Utilities/UnorderedMap.h
@@ -70,3 +70,4 @@ namespace __gnu_cxx
 using std::hash_map;
 #endif
 #endif
+