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)
commitf6a26acb1d58b1ccd50c938b785dc39df1877374
tree731cd8500abdb518f6525e7d959369971857922b
parentce0bfd481aa0958b4c802393f1c5536ec995df1e
parentcb392fefec38ec812606a42e18bfb74e4a72524f
Merge branch 'Dev_0.6.1' of newgeom:newgeom into Dev_0.6.1

Conflicts:
src/PartSet/PartSet_SketcherMgr.cpp