]> SALOME platform Git repositories - modules/shaper.git/commit
Salome HOME
Merge tag 'V_2.5.0' into cgt/V240
authorClarisse Genrault <clarisse.genrault@cea.fr>
Mon, 12 Sep 2016 06:34:53 +0000 (08:34 +0200)
committerClarisse Genrault <clarisse.genrault@cea.fr>
Mon, 12 Sep 2016 06:34:53 +0000 (08:34 +0200)
commita694e2f8dc973af8ff3e57f9bc53948681b0a344
treebf0432927306ee9f699bef4aef6fef6d56f70663
parente89d8f9bd80b306e895bdf75cdeaff2cd7124ee8
parent73b293b1c77ab13ac9fbbb2aefb3b8573e63180b
Merge tag 'V_2.5.0' into cgt/V240

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