]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Merge branch 'Dev_0.6.1' of newgeom:newgeom into Dev_0.6.1
authorvsv <vitaly.smetannikov@opencascade.com>
Sat, 27 Dec 2014 13:58:32 +0000 (16:58 +0300)
committervsv <vitaly.smetannikov@opencascade.com>
Sat, 27 Dec 2014 13:58:32 +0000 (16:58 +0300)
Conflicts:
src/PartSet/PartSet_SketcherMgr.cpp


Trivial merge