Salome HOME
Merge branch 'master' of newgeom:newgeom.git
authorsbh <sergey.belash@opencascade.com>
Wed, 23 Apr 2014 11:27:48 +0000 (15:27 +0400)
committersbh <sergey.belash@opencascade.com>
Wed, 23 Apr 2014 11:27:48 +0000 (15:27 +0400)
commitde0f49686ec6655ddc5816c8fa5383964662aec4
tree9fd58c4a36774b0753fb47755da090b15a2a4f6c
parentd34bcbd026e31b8cd22468f77ca977abac752162
parent912b947536177180af5bd6d620d84e9ebc05be66
Merge branch 'master' of newgeom:newgeom.git

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