From: nds <natalia.donis@opencascade.com>
Date: Wed, 29 Oct 2014 14:45:16 +0000 (+0300)
Subject: Merge branch 'master' of newgeom:newgeom
X-Git-Tag: V_0.5~64
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5b841e9801c659d762d708378df8c4d85565fda0;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom

Conflicts:
	src/PartSet/PartSet_Tools.cpp
---

5b841e9801c659d762d708378df8c4d85565fda0