Merge branch 'master' of newgeom:newgeom

diff --cc src/PartSetPlugin/PartSetPlugin_Part.h
index 25dc0e0ce7b3ac015483a4106a09ce2a557c3fc0,eaae463ad2831260dc75a595e9c8a761f645e09c..dc6a80a49bc76163f7cf230849336b874568d534
--- 1/src/PartSetPlugin/PartSetPlugin_Part.h
--- 2/src/PartSetPlugin/PartSetPlugin_Part.h
+++ b/src/PartSetPlugin/PartSetPlugin_Part.h
@@@ -34,11 -34,11 +34,14 @@@ public
  
    PARTSETPLUGIN_EXPORT virtual boost::shared_ptr<ModelAPI_Document> documentToAdd();
  
+   /// Returns true if this feature must be displayed in the history (top level of Part tree)
+   PARTSETPLUGIN_EXPORT virtual bool isInHistory() {return false;}
+ 
    /// Use plugin manager for features creation
    PartSetPlugin_Part();
 +
 +  /// Returns true if this feature must be displayed in the history (top level of Part tree)
 +  PARTSETPLUGIN_EXPORT virtual bool isInHistory() {return false;}
  };
  
  #endif

diff --cc src/XGUI/XGUI_Workshop.cpp
Simple merge