From: asl <asl@opencascade.com>
Date: Fri, 3 Nov 2017 06:44:23 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/BR_DEMO' into BR_2017
X-Git-Tag: v2.1~67
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b86ee42a0010ef6bde30373a8741dd865d557dd3;p=modules%2Fhydro.git

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

# Conflicts:
#	src/HYDROGUI/HYDROGUI_DataModel.cxx
---

b86ee42a0010ef6bde30373a8741dd865d557dd3