From: crouzet <nicolas.crouzet@cea.fr>
Date: Thu, 12 Apr 2018 15:17:26 +0000 (+0200)
Subject: Merge branch 'master' into nct/launcher
X-Git-Tag: 5.1.0~40
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a7ce8d1b8b251500f8fc8ac88c0752bd0a95d3c8;p=tools%2Fsat.git

Merge branch 'master' into nct/launcher
---

a7ce8d1b8b251500f8fc8ac88c0752bd0a95d3c8