Salome HOME
Merge branch 'master' of newgeom:newgeom
authornds <natalia.donis@opencascade.com>
Wed, 23 Apr 2014 12:27:32 +0000 (16:27 +0400)
committernds <natalia.donis@opencascade.com>
Wed, 23 Apr 2014 12:27:32 +0000 (16:27 +0400)
commitaa07c7e0e3410522a1464d1863d1052c96edb7aa
tree4e85a9b7854ce6deb6db146c157ae4ee75cc40c1
parent2eeb7eb916ca36bb522a2c65011d2bb8b0894fbc
parentde0f49686ec6655ddc5816c8fa5383964662aec4
Merge branch 'master' of newgeom:newgeom

Conflicts:
src/PartSet/PartSet_Module.cpp
src/XGUI/XGUI_Workshop.h
src/ModuleBase/ModuleBase_Operation.cpp
src/ModuleBase/ModuleBase_Operation.h
src/PartSet/PartSet_Module.cpp
src/PartSet/PartSet_Module.h
src/XGUI/XGUI_Workshop.cpp
src/XGUI/XGUI_Workshop.h