SALOME platform Git repositories - modules/hydro.git/commit

author	asl <asl@opencascade.com>
	Wed, 11 Oct 2017 09:12:15 +0000 (12:12 +0300)
committer	asl <asl@opencascade.com>
	Wed, 11 Oct 2017 09:12:15 +0000 (12:12 +0300)
commit	54c517abf4fb5f89df90c75a71d8292eec4148d6
tree	cacaae67f8db386c26db5551d3026b44e968e39a	tree \| snapshot
parent	5b6e09c6bbc0fdcbd3dfc34c0d3a5775a4dc3aea	commit \| diff
parent	55b90c28248cba37e6d70a62c0e7c0435615d14b	commit \| diff

Merge remote-tracking branch 'origin/BR_1321_ECW' into BR_DEMO

# Conflicts:
# doc/CMakeLists.txt
# src/HYDROData/HYDROData_IProfilesInterpolator.h
# src/HYDROGUI/HYDROGUI_BathymetryPrs.cxx
# src/HYDROGUI/HYDROGUI_BathymetryPrs.h
# src/HYDRO_tests/CMakeLists.txt
# src/HYDRO_tests/reference_data/Extraction_Channel.png
# src/HYDRO_tests/reference_data/Extraction_ImmZone.png
# src/HYDRO_tests/reference_data/Merge_Polylines.png
# src/HYDRO_tests/reference_data/Polyline_Presentation.png
# src/HYDRO_tests/reference_data/Split_Polylines_Colors.png
# src/HYDRO_tests/reference_data/Split_Straight.png

src/HYDROGUI/HYDROGUI_BathymetryPrs.cxx	diff1 \|	diff2 \|	blob \| history
src/HYDROGUI/resources/HYDROGUI_msg_en.ts	diff1 \|	diff2 \|	blob \| history
src/HYDRO_tests/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history