*Merge.

--HG--
branch : trunk

27 files changed, 27 insertions, 0 deletions

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
+