Merge branch 'BR_SINUSX_FORMAT' of ssh://git.salome-platform.org/modules/hydro into...

Conflicts:
	src/HYDROData/HYDROData_SinusX.cxx

diff --cc src/HYDROData/HYDROData_SinusX.cxx
index bca60482b95a9df268d6c5cf60ce1cd079f3db24,da8e48b1fdf9366ce1d0e08fcff78b5e6b34afd9..025810b78afe5043c2b29ec55fa5a35111e0b759
--- 1/src/HYDROData/HYDROData_SinusX.cxx
--- 2/src/HYDROData/HYDROData_SinusX.cxx
+++ b/src/HYDROData/HYDROData_SinusX.cxx
@@@ -87,6 -89,6 +87,8 @@@ QString HYDROData_SinusX::GetName(cons
  
  }
  
++}
++
  
  bool HYDROData_SinusX::Import(const QString& theFilePath, Handle(HYDROData_Document) theDocument, NCollection_Sequence<Handle_HYDROData_Entity>& theEntities)
  {