Salome HOME
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
authornds <natalia.donis@opencascade.com>
Thu, 16 Apr 2015 17:28:12 +0000 (20:28 +0300)
committernds <natalia.donis@opencascade.com>
Thu, 16 Apr 2015 17:28:12 +0000 (20:28 +0300)
commit58185df5c4d0877054ea33a0fe8ebded75bd9d7b
tree3fb89003da1a873fc8545a9000c058f92336f419
parent9d9ff3badaec1d230a701582d588b1e75c0fc09c
parent114994217c1f77cdc9ab17984456c46808812325
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

Conflicts:
src/PartSet/PartSet_SketcherMgr.cpp
src/PartSet/PartSet_SketcherMgr.cpp