]> SALOME platform Git repositories - modules/shaper.git/commit - src/SketchPlugin/SketchPlugin_ConstraintDistance.h
Salome HOME
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)
commit97209b9a0fa0fd1496b96edbdb3100eb771d86c4
tree5207f2fd6fcbcdb2f9bd77f6e6f3da65975a20f4
parentc46bbabbbdc3ca55df465836b1298e2228ac05cb
parent72fe2af9c04daae44747cdce2f03ec395a4e5511
Merge remote-tracking branch 'remotes/origin/master' into SolveSpace

Conflicts:
src/SketchPlugin/SketchPlugin_Constraint.cpp
src/SketchPlugin/SketchPlugin_ConstraintDistance.cpp
Solution:
Get local version