Salome HOME
projects
/
modules
/
shaper.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e2d08c1
81bf735
)
Merge branch 'master' of newgeom:newgeom.git
author
Sergey BELASH
<belash.sergey@opencascade.com>
Mon, 18 Aug 2014 12:12:23 +0000
(16:12 +0400)
committer
Sergey BELASH
<belash.sergey@opencascade.com>
Mon, 18 Aug 2014 12:12:23 +0000
(16:12 +0400)
Conflicts:
src/XGUI/XGUI_MainMenu.cpp
Trivial merge
