From: isn <isn@opencascade.com>
Date: Wed, 17 Jun 2015 12:43:42 +0000 (+0300)
Subject: Merge branch 'BR_SINUSX_FORMAT' of ssh://git.salome-platform.org/modules/hydro into... 
X-Git-Tag: v1.4.2~54^2~10
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=bcb84a2835695c63758a00d127ee4a0c7704e48d;p=modules%2Fhydro.git

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

Conflicts:
	src/HYDROData/HYDROData_SinusX.cxx
---

bcb84a2835695c63758a00d127ee4a0c7704e48d
diff --cc src/HYDROData/HYDROData_SinusX.cxx
index bca60482,da8e48b1..025810b7
--- a/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)
  {