Merge branch 'BR_v14_rc' into BR_quadtree

diff --cc src/HYDROData/CMakeLists.txt
Simple merge

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

diff --cc src/HYDROData/HYDROData_Bathymetry.h
index 854b29f460b44eb9be05a697c4cf54ae96a06246,9cd17328fe7200ad90cfc09f4a0d4b4785fb6410..427199688f9ac274de2a2a927b43788b8ba8fd36
--- 1/src/HYDROData/HYDROData_Bathymetry.h
--- 2/src/HYDROData/HYDROData_Bathymetry.h
+++ b/src/HYDROData/HYDROData_Bathymetry.h
@@@ -143,8 -141,10 +143,11 @@@ private
     */
    bool                                      importFromXYZFile( QFile&          theFile,
                                                                 AltitudePoints& thePoints ) const;
 +  static std::map<int, HYDROData_QuadtreeNode*> myQuadtrees;
  
+   bool                                      importFromASCFile( QFile&          theFile,
+                                                                AltitudePoints& thePoints ) const;
+ 
  protected:
  
    friend class HYDROData_Iterator;

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