From: vsv <vitaly.smetannikov@opencascade.com>
Date: Sat, 27 Dec 2014 13:58:32 +0000 (+0300)
Subject: Merge branch 'Dev_0.6.1' of newgeom:newgeom into Dev_0.6.1
X-Git-Tag: V_0.7.0_rc1~26
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f6a26acb1d58b1ccd50c938b785dc39df1877374;p=modules%2Fshaper.git

Merge branch 'Dev_0.6.1' of newgeom:newgeom into Dev_0.6.1

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

f6a26acb1d58b1ccd50c938b785dc39df1877374