From: asl <asl@opencascade.com>
Date: Thu, 28 Sep 2017 06:21:46 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/BR_1332' into BR_1331
X-Git-Tag: v2.1~66^2~12^2~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6b8caf18d58b91e8900f78d0ad38ba04d8a91778;p=modules%2Fhydro.git

Merge remote-tracking branch 'origin/BR_1332' into BR_1331

# Conflicts:
#	src/HYDROGUI/HYDROGUI_PolylineOp.cxx
#	src/HYDROGUI/HYDROGUI_ProfileOp.cxx
---

6b8caf18d58b91e8900f78d0ad38ba04d8a91778