From: Clarisse Genrault <clarisse.genrault@cea.fr>
Date: Mon, 12 Sep 2016 06:34:53 +0000 (+0200)
Subject: Merge tag 'V_2.5.0' into cgt/V240
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a694e2f8dc973af8ff3e57f9bc53948681b0a344;p=modules%2Fshaper.git

Merge tag 'V_2.5.0' into cgt/V240

Conflicts:
	src/ConstructionAPI/ConstructionAPI_Axis.h
---

a694e2f8dc973af8ff3e57f9bc53948681b0a344