From: sbh <sergey.belash@opencascade.com>
Date: Tue, 29 Jul 2014 10:22:18 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom.git
X-Git-Tag: V_0.4.4~136
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=bfab38b072ad729d6c98ad21b374218a22ea730f;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom.git

Conflicts:
	src/SketchPlugin/Test/TestConstraintLength.py
---

bfab38b072ad729d6c98ad21b374218a22ea730f