From: Gilles DAVID <gilles-g.david@edf.fr>
Date: Thu, 18 May 2017 16:03:44 +0000 (+0200)
Subject: Merge branch 'V8_3_BR' into ngr/python3_dev
X-Git-Tag: V9_0_0~6^2~6
X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=442fd64c19a6e27a339ca36264c15ec91732cf32;hp=--cc

Merge branch 'V8_3_BR' into ngr/python3_dev

Conflicts:
	src/Tools/padder/spadderpy/gui/inputdialog.py
---

442fd64c19a6e27a339ca36264c15ec91732cf32