]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Merge remote-tracking branch 'remotes/origin/master' into SolveSpace
authorazv <azv@opencascade.com>
Tue, 20 May 2014 08:16:54 +0000 (12:16 +0400)
committerazv <azv@opencascade.com>
Tue, 20 May 2014 08:16:54 +0000 (12:16 +0400)
Conflicts:
src/SketchPlugin/SketchPlugin_Feature.cpp
src/SketchPlugin/SketchPlugin_Feature.h

1  2 
src/PartSet/PartSet_OperationSketchBase.cpp