]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Merge branch 'master' of newgeom:newgeom
authorvsv <vitaly.smetannikov@opencascade.com>
Thu, 8 May 2014 14:02:50 +0000 (18:02 +0400)
committervsv <vitaly.smetannikov@opencascade.com>
Thu, 8 May 2014 14:02:50 +0000 (18:02 +0400)
Conflicts:
src/XGUI/XGUI_msg_fr.ts


Trivial merge