From: vsv <vitaly.smetannikov@opencascade.com>
Date: Thu, 8 May 2014 14:02:50 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom
X-Git-Tag: V_0.2~78
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d0a5b5b068f5b1b55095d3b4f9f4fe4da7165b40;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom

Conflicts:
	src/XGUI/XGUI_msg_fr.ts
---

d0a5b5b068f5b1b55095d3b4f9f4fe4da7165b40