Salome HOME
projects
/
modules
/
shaper.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
29cf3cf
b200f5e
)
Merge branch 'master' of newgeom:newgeom
author
vsv
<vitaly.smetannikov@opencascade.com>
Thu, 8 May 2014 14:02:50 +0000
(18:02 +0400)
committer
vsv
<vitaly.smetannikov@opencascade.com>
Thu, 8 May 2014 14:02:50 +0000
(18:02 +0400)
Conflicts:
src/XGUI/XGUI_msg_fr.ts
Trivial merge
