From: vsr <vsr@opencascade.com>
Date: Tue, 25 Mar 2014 08:22:59 +0000 (+0400)
Subject: Merge branch 'V7_main'
X-Git-Tag: V7_4_0a1~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=698f9beb51997f3a25cbaffcb2b7b7fb7408aa2b;p=plugins%2Fhexoticplugin.git

Merge branch 'V7_main'
---

698f9beb51997f3a25cbaffcb2b7b7fb7408aa2b