]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Merge branch 'master' of newgeom:newgeom.git
authorSergey BELASH <belash.sergey@opencascade.com>
Mon, 18 Aug 2014 12:12:23 +0000 (16:12 +0400)
committerSergey BELASH <belash.sergey@opencascade.com>
Mon, 18 Aug 2014 12:12:23 +0000 (16:12 +0400)
Conflicts:
src/XGUI/XGUI_MainMenu.cpp


Trivial merge