Salome HOME
Merge branch 'master' of newgeom:newgeom
authorvsv <vitaly.smetannikov@opencascade.com>
Fri, 3 Oct 2014 12:17:18 +0000 (16:17 +0400)
committervsv <vitaly.smetannikov@opencascade.com>
Fri, 3 Oct 2014 12:17:18 +0000 (16:17 +0400)
commit12866ad4430e2c7b4fe186d7117291e7aa09a18e
tree9d94aa90ca02ff53fd805d1bbccfb4e9aba8ef19
parent19bc85698899d6bee8704e7b0953ee045b0eb66f
parent93310e00f0ac95395137c842108790bf62e6425e
Merge branch 'master' of newgeom:newgeom

Conflicts:
src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
src/PartSet/PartSet_OperationFeatureBase.cpp
src/ModuleBase/CMakeLists.txt
src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
src/PartSet/PartSet_OperationFeatureBase.cpp
src/XGUI/XGUI_Workshop.cpp