Salome HOME
Merge branch 'Dev_1.2.0' of newgeom:newgeom into Dev_1.2.0
authorvsv <vitaly.smetannikov@opencascade.com>
Thu, 30 Apr 2015 10:02:27 +0000 (13:02 +0300)
committervsv <vitaly.smetannikov@opencascade.com>
Thu, 30 Apr 2015 10:02:27 +0000 (13:02 +0300)
commited67f7abf2985c7225b7862c076257825a421993
tree82f16b2e99fbe16abcacd1b2f28359f5eca8586b
parentb1a9aba9a812f170668d0f4e04b3501d91da425e
parent52a2aa0728f8694d5774a20bd1eeba8e5e2f8b27
Merge branch 'Dev_1.2.0' of newgeom:newgeom into Dev_1.2.0

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