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

author asl <asl@opencascade.com>

Wed, 15 Nov 2017 07:36:13 +0000 (10:36 +0300)

committer asl <asl@opencascade.com>

Wed, 15 Nov 2017 07:36:13 +0000 (10:36 +0300)
author asl <asl@opencascade.com>
Wed, 15 Nov 2017 07:36:13 +0000 (10:36 +0300)
committer asl <asl@opencascade.com>
Wed, 15 Nov 2017 07:36:13 +0000 (10:36 +0300)
diff --cc src/HYDRO_tests/TestViewer.cxx
Simple merge
author	asl <asl@opencascade.com>
	Wed, 15 Nov 2017 07:36:13 +0000 (10:36 +0300)
committer	asl <asl@opencascade.com>
	Wed, 15 Nov 2017 07:36:13 +0000 (10:36 +0300)