merge master 2015/06/04

diff --cc src/HYDROData/CMakeLists.txt
index 53fb279f91e44dcf13c097f2fda2be57b0ed0ce0,188d4d2beeddcaecb9119d4eccf8bfca877b6abb..069e25be4660c876874ebc2c87a3e73d7c10c1b3
--- 1/src/HYDROData/CMakeLists.txt
--- 2/src/HYDROData/CMakeLists.txt
+++ b/src/HYDROData/CMakeLists.txt
@@@ -47,11 -46,10 +47,15 @@@ set(PROJECT_HEADER
      HYDROData_VisualState.h
      HYDROData_Warning.h
      HYDROData_Zone.h
 +    HYDROData_Tree.hxx
 +    HYDROData_Quadtree.hxx
 +    HYDROData_QuadtreeNode.hxx
 +    HYDROData_Octree.hxx
 +    HYDROData_OctreeNode.hxx
+     HYDROData_GeomTool.h
+     HYDROData_IProfilesInterpolator.h
+     HYDROData_LinearInterpolator.h
+     HYDROData_InterpolatorsFactory.h
  )
  
  set(PROJECT_SOURCES 
@@@ -98,10 -96,10 +102,14 @@@
      HYDROData_Transform.cxx
      HYDROData_VisualState.cxx
      HYDROData_Zone.cxx
 +    HYDROData_Quadtree.cxx
 +    HYDROData_QuadtreeNode.cxx
 +    HYDROData_Octree.cxx
 +    HYDROData_OctreeNode.cxx
+     HYDROData_GeomTool.cxx
+     HYDROData_IProfilesInterpolator.cxx
+     HYDROData_LinearInterpolator.cxx
+     HYDROData_InterpolatorsFactory.cxx
  )
  
  add_definitions(

diff --cc src/HYDROData/HYDROData_Bathymetry.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_Bathymetry.h
Simple merge

diff --cc src/HYDROData/HYDROData_CalculationCase.cxx
Simple merge