]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Merge branch 'master' of newgeom:newgeom
authornds <natalia.donis@opencascade.com>
Fri, 16 May 2014 04:34:57 +0000 (08:34 +0400)
committernds <natalia.donis@opencascade.com>
Fri, 16 May 2014 04:34:57 +0000 (08:34 +0400)
Conflicts:
src/XGUI/XGUI_Workshop.cpp


Trivial merge