Merge branch 'BR_LCM_COMP' into BR_LAND_COVER_MAP

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

diff --cc src/HYDROData/HYDROData_LandCoverMap.h
index 15f293f7218075f239c3d96245a6b8c079f2dd87,16c204dd6400d6169e23e83ba24b76d190e6d58b..fd6dc5861c3390217295592b35ec3e2431ba3b1c
--- 1/src/HYDROData/HYDROData_LandCoverMap.h
--- 2/src/HYDROData/HYDROData_LandCoverMap.h
+++ b/src/HYDROData/HYDROData_LandCoverMap.h
@@@ -24,9 -24,8 +24,10 @@@
  #include <NCollection_IndexedDataMap.hxx>
  #include <QString>
  #include <TopoDS_Face.hxx>
+ #include <TopExp_Explorer.hxx>
  
 +class Handle_HYDROData_StricklerTable;
 +
  typedef NCollection_IndexedDataMap<TopoDS_Face, QString> HYDROData_MapOfFaceToStricklerType;
  
  DEFINE_STANDARD_HANDLE( HYDROData_LandCoverMap, HYDROData_Entity )

diff --cc src/HYDRO_tests/TestViewer.cxx
Simple merge

diff --cc src/HYDRO_tests/TestViewer.h
Simple merge

diff --cc src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
Simple merge