]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
projects / modules / shaper.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c46bbab 72fe2af)
Merge remote-tracking branch 'remotes/origin/master' into SolveSpace
authorazv <azv@opencascade.com>
Tue, 13 May 2014 05:57:28 +0000 (09:57 +0400)
committerazv <azv@opencascade.com>
Tue, 13 May 2014 05:57:28 +0000 (09:57 +0400)
Conflicts:
src/SketchPlugin/SketchPlugin_Constraint.cpp
src/SketchPlugin/SketchPlugin_ConstraintDistance.cpp
Solution:
Get local version


Trivial merge
SALOME Shaper module

Copyright © 2005 - 2024 Open CASCADE.
All rights reserved.
Legal Information