Salome HOME
Merge branch 'master' into Dev_1.1.0
authorsbh <sergey.belash@opencascade.com>
Mon, 9 Feb 2015 09:06:33 +0000 (12:06 +0300)
committersbh <sergey.belash@opencascade.com>
Mon, 9 Feb 2015 09:06:33 +0000 (12:06 +0300)
commit4f5cbc32b2621344e253876da67abc1ccd94fe31
treee910dfec0359f3a0b03954a326a56e128883d5b2
parente41462efa92b485f31903e3653d523b0a77a5296
parent794ff5a3d14e29b31249dd0b31a38cb90b9c35b2
Merge branch 'master' into Dev_1.1.0

Conflicts:
src/PartSet/PartSet_WidgetSketchLabel.cpp
src/Model/Model_AttributeSelection.cpp
src/Model/Model_ResultBody.cpp
src/ModuleBase/ModuleBase_IModule.h
src/PartSet/PartSet_Module.cpp
src/XGUI/XGUI_Workshop.cpp