From: Sergey BELASH <belash.sergey@opencascade.com>
Date: Mon, 18 Aug 2014 12:12:23 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom.git
X-Git-Tag: V_0.4.4~105
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=57c61908ce2c9d9386762d76c7606eeaa7f8a48c;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom.git

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

57c61908ce2c9d9386762d76c7606eeaa7f8a48c