Salome HOME
Merge branch 'master' of newgeom:newgeom
authornds <natalia.donis@opencascade.com>
Tue, 24 Jun 2014 15:39:37 +0000 (19:39 +0400)
committernds <natalia.donis@opencascade.com>
Tue, 24 Jun 2014 15:39:37 +0000 (19:39 +0400)
commit96c062912cdd3eff24d2d28ab75769f26e0d84cd
treec42d2a5cf101da4a41ac45d371d292e89b70fa0e
parent14d3980515c46076881ff80812f2c1e151211083
parent3eb36845861d4ae0fd4b775a0cc5e938dd75f5c3
Merge branch 'master' of newgeom:newgeom

Conflicts:
src/PartSet/PartSet_OperationFeatureCreate.cpp
src/PartSet/PartSet_OperationFeatureCreate.cpp
src/SketchPlugin/SketchPlugin_ConstraintLength.cpp
src/SketchPlugin/SketchPlugin_ConstraintLength.h