]> SALOME platform Git repositories - modules/shaper.git/commit - src/SketchPlugin/SketchPlugin_Feature.cpp
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)
commita398103d11950df8cb50eeea49942237eb16edcf
treef735901f36d2bd22f2ff1ffb1fdef65c24fab347
parent34a981282cec404955f9850aabf4015a97bcb57c
parent2677fb268b57b8c5ea2538b37efd80d933137e43
Merge branch 'master' of newgeom:newgeom

Conflicts:
src/XGUI/XGUI_Workshop.cpp