From: nds <natalia.donis@opencascade.com>
Date: Fri, 16 May 2014 04:34:57 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom
X-Git-Tag: V_0.2~59
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a398103d11950df8cb50eeea49942237eb16edcf;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom

Conflicts:
	src/XGUI/XGUI_Workshop.cpp
---

a398103d11950df8cb50eeea49942237eb16edcf