From: sbh <sergey.belash@opencascade.com>
Date: Mon, 9 Feb 2015 09:06:33 +0000 (+0300)
Subject: Merge branch 'master' into Dev_1.1.0
X-Git-Tag: V_1.1.0~208^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4f5cbc32b2621344e253876da67abc1ccd94fe31;p=modules%2Fshaper.git

Merge branch 'master' into Dev_1.1.0

Conflicts:
	src/PartSet/PartSet_WidgetSketchLabel.cpp
---

4f5cbc32b2621344e253876da67abc1ccd94fe31
diff --cc src/ModuleBase/ModuleBase_IModule.h
index 01896bb8f,b500dd6f8..32c7cdcbf
--- a/src/ModuleBase/ModuleBase_IModule.h
+++ b/src/ModuleBase/ModuleBase_IModule.h
@@@ -127,10 -127,10 +127,13 @@@ protected slots
  
    /// Register selection filters for this module
    virtual void registerFilters() {}
+ 
+   /// Register properties of this module
+   virtual void registerProperties() {}
  
 +  /// Register properties of this module
 +  virtual void registerProperties() {}
 +
    /// Returns new instance of operation object (used in createOperation for customization)
    virtual ModuleBase_Operation* getNewOperation(const std::string& theFeatureId);