Salome HOME
projects
/
modules
/
shaper.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4d17967
4a01571
)
Merge branch 'master' of newgeom:newgeom.git
author
sbh
<sergey.belash@opencascade.com>
Tue, 29 Jul 2014 10:22:18 +0000
(14:22 +0400)
committer
sbh
<sergey.belash@opencascade.com>
Tue, 29 Jul 2014 10:22:18 +0000
(14:22 +0400)
Conflicts:
src/SketchPlugin/Test/TestConstraintLength.py
1
2
src/SketchPlugin/Test/TestConstraintLength.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/SketchPlugin/Test/TestConstraintLength.py
Simple merge
