]> SALOME platform Git repositories - modules/shaper.git/commit
Salome HOME
Merge branch 'Dev_0.7.1' of newgeom:newgeom into Dev_0.7.1
authornds <natalia.donis@opencascade.com>
Mon, 26 Jan 2015 08:28:11 +0000 (11:28 +0300)
committernds <natalia.donis@opencascade.com>
Mon, 26 Jan 2015 08:28:11 +0000 (11:28 +0300)
commitd499ef7358a4dc4ce020054fc94ef04c22e9e444
tree0603ee852dcd63e4886959314e47c183ad69bfdc
parent1c2db2a9ea5f192e2bde3c81e19a9915e2f89d53
parentc47decf94380d5c06fd22a03634e464f8ed33de6
Merge branch 'Dev_0.7.1' of newgeom:newgeom into Dev_0.7.1

Conflicts:
src/ModuleBase/ModuleBase_ModelWidget.h
src/PartSet/PartSet_SketcherMgr.cpp
src/ModuleBase/ModuleBase_IPropertyPanel.h
src/ModuleBase/ModuleBase_ModelWidget.h
src/PartSet/PartSet_SketcherMgr.cpp
src/XGUI/XGUI_Workshop.cpp