Salome HOME
Merge branch 'master' of newgeom:newgeom
authorvsv <vitaly.smetannikov@opencascade.com>
Thu, 24 Jul 2014 13:16:09 +0000 (17:16 +0400)
committervsv <vitaly.smetannikov@opencascade.com>
Thu, 24 Jul 2014 13:16:09 +0000 (17:16 +0400)
commit7210ed3a44c73d261bb5abb28fae1489c5a35b30
treed3c5502e554df87b1a4e5483f1224af83a307a4f
parent196230e7b9144d8cb785eb5e021e89188c7161dc
parent9d39123efbd6bde772377542ce40fb51f7925c1f
Merge branch 'master' of newgeom:newgeom

Conflicts:
src/ModuleBase/ModuleBase_Tools.cpp
src/ModuleBase/ModuleBase_Tools.cpp
src/PartSet/PartSet_Module.cpp
src/PartSet/PartSet_Module.h
src/PartSet/PartSet_OperationFeatureEdit.cpp
src/PartSet/PartSet_OperationFeatureEditMulti.cpp
src/PartSet/PartSet_OperationSketchBase.h