]> SALOME platform Git repositories - modules/shaper.git/commit
Salome HOME
Merge branch 'master' into cgt/V240
authorClarisse Genrault <clarisse.genrault@cea.fr>
Fri, 24 Jun 2016 08:23:51 +0000 (10:23 +0200)
committerClarisse Genrault <clarisse.genrault@cea.fr>
Fri, 24 Jun 2016 08:23:51 +0000 (10:23 +0200)
commitd02cbd788a848f0d5cc7c9f3b4877f6b024a09f7
tree762f6e3cc798082d519529a0edaa074ccb134c2f
parent90501aa891047a4e0ae0c9d6d3d6d8ed6f88582d
parent136a16a9167fa6de18aa9fa06c499a6a7d82a0bc
Merge branch 'master' into cgt/V240

Conflicts:
src/GeomAlgoAPI/CMakeLists.txt
CMakeLists.txt
src/ConstructionPlugin/axis_widget.xml
src/GeomAlgoAPI/CMakeLists.txt