*Merge.

--HG--
branch : trunk

9 files changed, 9 insertions, 0 deletions

diff --git a/src/framework/GameSystem/Grid.h b/src/framework/GameSystem/Grid.h
index 0210f62faf7..646345705d3 100644
--- a/src/framework/GameSystem/Grid.h
+++ b/src/framework/GameSystem/Grid.h
@@ -129,3 +129,4 @@ class TRINITY_DLL_DECL Grid
         TypeMapContainer<WORLD_OBJECT_TYPES> i_objects;
 };
 #endif
+
diff --git a/src/framework/GameSystem/GridLoader.h b/src/framework/GameSystem/GridLoader.h
index df46585c225..8a483044f8f 100644
--- a/src/framework/GameSystem/GridLoader.h
+++ b/src/framework/GameSystem/GridLoader.h
@@ -76,3 +76,4 @@ class TRINITY_DLL_DECL GridLoader
         }
 };
 #endif
+
diff --git a/src/framework/GameSystem/GridRefManager.h b/src/framework/GameSystem/GridRefManager.h
index 63e5065dc12..bd32f836e18 100644
--- a/src/framework/GameSystem/GridRefManager.h
+++ b/src/framework/GameSystem/GridRefManager.h
@@ -41,3 +41,4 @@ class GridRefManager : public RefManager<GridRefManager<OBJECT>, OBJECT>
         iterator rend() { return iterator(NULL); }
 };
 #endif
+
diff --git a/src/framework/GameSystem/GridReference.h b/src/framework/GameSystem/GridReference.h
index 529278ea036..d4bd6752515 100644
--- a/src/framework/GameSystem/GridReference.h
+++ b/src/framework/GameSystem/GridReference.h
@@ -52,3 +52,4 @@ class TRINITY_DLL_SPEC GridReference : public Reference<GridRefManager<OBJECT>,
         GridReference *next() { return (GridReference*)Reference<GridRefManager<OBJECT>, OBJECT>::next(); }
 };
 #endif
+
diff --git a/src/framework/GameSystem/NGrid.h b/src/framework/GameSystem/NGrid.h
index 6ed87624662..6b89cdbedba 100644
--- a/src/framework/GameSystem/NGrid.h
+++ b/src/framework/GameSystem/NGrid.h
@@ -160,3 +160,4 @@ class TRINITY_DLL_DECL NGrid
         bool i_GridObjectDataLoaded;
 };
 #endif
+
diff --git a/src/framework/GameSystem/TypeContainer.h b/src/framework/GameSystem/TypeContainer.h
index e4a30103d2d..9e4c6da65e2 100644
--- a/src/framework/GameSystem/TypeContainer.h
+++ b/src/framework/GameSystem/TypeContainer.h
@@ -128,3 +128,4 @@ class TRINITY_DLL_DECL TypeMapContainer
         ContainerMapList<OBJECT_TYPES> i_elements;
 };
 #endif
+
diff --git a/src/framework/GameSystem/TypeContainerFunctions.h b/src/framework/GameSystem/TypeContainerFunctions.h
index ec005e2218c..f9945f84ac7 100644
--- a/src/framework/GameSystem/TypeContainerFunctions.h
+++ b/src/framework/GameSystem/TypeContainerFunctions.h
@@ -172,3 +172,4 @@ namespace Trinity
 
 }
 #endif
+
diff --git a/src/framework/GameSystem/TypeContainerFunctionsPtr.h b/src/framework/GameSystem/TypeContainerFunctionsPtr.h
index 5f15f6c65a7..b22c07db2b4 100644
--- a/src/framework/GameSystem/TypeContainerFunctionsPtr.h
+++ b/src/framework/GameSystem/TypeContainerFunctionsPtr.h
@@ -167,3 +167,4 @@ namespace Trinity
 
 }
 #endif
+
diff --git a/src/framework/GameSystem/TypeContainerVisitor.h b/src/framework/GameSystem/TypeContainerVisitor.h
index c544afa0f5e..97570b370c2 100644
--- a/src/framework/GameSystem/TypeContainerVisitor.h
+++ b/src/framework/GameSystem/TypeContainerVisitor.h
@@ -116,3 +116,4 @@ class TRINITY_DLL_DECL TypeContainerVisitor
         VISITOR &i_visitor;
 };
 #endif
+