From: sbh <sergey.belash@opencascade.com>
Date: Thu, 12 Feb 2015 14:36:11 +0000 (+0300)
Subject: Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0
X-Git-Tag: V_1.1.0~195^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b69a4c4ae0f7eb0e9c17d3db0229b04b1fe77ecf;p=modules%2Fshaper.git

Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0

Conflicts:
	src/AppElements/AppElements_Command.cpp
---

b69a4c4ae0f7eb0e9c17d3db0229b04b1fe77ecf