]> SALOME platform Git repositories - modules/shaper.git/commit
Salome HOME
Merge branch 'master' into cgt/V240
authorClarisse Genrault <clarisse.genrault@cea.fr>
Wed, 3 Aug 2016 14:18:10 +0000 (16:18 +0200)
committerClarisse Genrault <clarisse.genrault@cea.fr>
Wed, 3 Aug 2016 14:18:10 +0000 (16:18 +0200)
commitfd60f33cbe2c9a3569681cfa3b7b492230da5afb
treed61a77c2b44f246db00cc274ab986e56c8bdd9ff
parent9307a524f06875e951e501ff3113d07a21ae5f14
parent7d320d0406ddf756ca4fb478ed8d366f03e09b22
Merge branch 'master' into cgt/V240

Conflicts:
src/ConstructionAPI/ConstructionAPI_Axis.cpp
src/ConstructionAPI/ConstructionAPI_Axis.h
src/ConstructionPlugin/CMakeLists.txt
src/ConstructionPlugin/ConstructionPlugin_Axis.cpp
src/ConstructionPlugin/axis_widget.xml
src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.h
src/PrimitivesPlugin/Test/UnitTestBox.py
src/PythonAPI/CMakeLists.txt
src/ConstructionAPI/ConstructionAPI_Axis.h
src/ConstructionPlugin/ConstructionPlugin_Axis.cpp
src/PrimitivesPlugin/Test/UnitTestBox.py