From: vsv <vitaly.smetannikov@opencascade.com>
Date: Thu, 22 Dec 2016 13:09:03 +0000 (+0300)
Subject: Merge branch 'SALOME-8.2.0_porting'
X-Git-Tag: V_2.7.0~351^2~55
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c795030a80f70473cfcd9bd1bbe2d65f3b25fb0b;p=modules%2Fshaper.git

Merge branch 'SALOME-8.2.0_porting'

Conflicts:
	src/SketchPlugin/Test/TestArcBehavior.py
	src/XGUI/CMakeLists.txt
---

c795030a80f70473cfcd9bd1bbe2d65f3b25fb0b