From: Cédric Aguerre <cedric.aguerre@edf.fr>
Date: Fri, 20 Nov 2015 16:04:35 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: simple_cmake~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=156e17edc0ba736b1393736bde8e47e1e66be5e5;p=modules%2Fparavis.git

Merge remote-tracking branch 'origin/master'
---

156e17edc0ba736b1393736bde8e47e1e66be5e5