]> SALOME platform Git repositories - modules/shaper.git/commit
Salome HOME
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
authormpv <mpv@opencascade.com>
Wed, 25 Mar 2015 09:08:24 +0000 (12:08 +0300)
committermpv <mpv@opencascade.com>
Wed, 25 Mar 2015 09:08:24 +0000 (12:08 +0300)
commitc44da4cdb21b305f2350bb4b2c9044eaba08f171
treef3d406a7f3c01f23ff998d31141436137191033f
parent241b57ba3887bc2d239df98405c4fc4d6979119b
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

Conflicts:
src/SketchPlugin/SketchPlugin_Sketch.cpp
CMakeLists.txt
src/PartSet/icons/tangent.png