Salome HOME
Merge branch 'master' of newgeom:newgeom
authorvsv <vitaly.smetannikov@opencascade.com>
Tue, 28 Oct 2014 09:51:44 +0000 (12:51 +0300)
committervsv <vitaly.smetannikov@opencascade.com>
Tue, 28 Oct 2014 09:51:44 +0000 (12:51 +0300)
commit61da4e89d2ec63daa429d304f928482a0e6fa0b7
treedb9ddfb52a8e46ba77dc578edb4f78b326c21980
parentb851613e697ad60c47e633121933a5ee4b640789
parent9eb5801ea57b763b26db2c7bf897a50b34e2cc31
Merge branch 'master' of newgeom:newgeom

Conflicts:
src/PartSet/PartSet_OperationFeatureEditMulti.cpp
src/ModuleBase/ModuleBase_Operation.cpp
src/ModuleBase/ModuleBase_ResultPrs.cpp
src/ModuleBase/ModuleBase_WidgetFactory.cpp
src/PartSet/PartSet_OperationFeatureEditMulti.cpp
src/PartSet/PartSet_OperationFeatureEditMulti.h