]> SALOME platform Git repositories - modules/shaper.git/commit
Salome HOME
Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0
authorsbh <sergey.belash@opencascade.com>
Thu, 26 Feb 2015 18:46:18 +0000 (21:46 +0300)
committersbh <sergey.belash@opencascade.com>
Thu, 26 Feb 2015 18:46:18 +0000 (21:46 +0300)
commit3c0b551f57002a6e5195ef959f8056aa9df72baf
tree0b26382f158af0bf03f0d88588ad41a48c5e5a62
parentb25922145a97fccf8d2613d0ef52a283d3ce0987
parent22df2f3d52b661c4cffef91085300cffc02dfa65
Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0

Conflicts:
src/ModuleBase/ModuleBase_WidgetBoolValue.cpp
21 files changed:
src/ModuleBase/ModuleBase_ModelWidget.cpp
src/ModuleBase/ModuleBase_ModelWidget.h
src/ModuleBase/ModuleBase_WidgetBoolValue.cpp
src/ModuleBase/ModuleBase_WidgetBoolValue.h
src/ModuleBase/ModuleBase_WidgetChoice.cpp
src/ModuleBase/ModuleBase_WidgetChoice.h
src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
src/ModuleBase/ModuleBase_WidgetDoubleValue.h
src/ModuleBase/ModuleBase_WidgetFileSelector.cpp
src/ModuleBase/ModuleBase_WidgetFileSelector.h
src/ModuleBase/ModuleBase_WidgetLabel.h
src/ModuleBase/ModuleBase_WidgetLineEdit.cpp
src/ModuleBase/ModuleBase_WidgetLineEdit.h
src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
src/ModuleBase/ModuleBase_WidgetMultiSelector.h
src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
src/ModuleBase/ModuleBase_WidgetShapeSelector.h
src/PartSet/PartSet_Module.cpp
src/PartSet/PartSet_WidgetPoint2d.cpp
src/PartSet/PartSet_WidgetPoint2d.h
src/PartSet/PartSet_WidgetSketchLabel.h