Merge branch 'master' of newgeom:newgeom.git

diff --cc src/Config/Config_FeatureMessage.h
index 8f5fc335418b5d17f55c522774ff4a9ce0b3306a,64f2881e660816999caa53089bdc065d4b77a9d4..ba0c64c7bd47e3ab1daf4f5566b56850de3c1524
--- 1/src/Config/Config_FeatureMessage.h
--- 2/src/Config/Config_FeatureMessage.h
+++ b/src/Config/Config_FeatureMessage.h
@@@ -3,25 -3,20 +3,25 @@@
  \r
  #include "Config.h"\r
  \r
- #include <Event_Message.hxx>\r
+ #include <Event_Message.h>\r
  #include <string>\r
  \r
 +/*\r
 + * Class to pass a feature entry extracted from xml file.\r
 + * Example of the feature entry:\r
 + * <feature id="new_part" text="Part" tooltip="Creates a new part" icon=":pictures/part_ico.png"/>\r
 + */\r
  class CONFIG_EXPORT Config_FeatureMessage: public Event_Message\r
  {\r
 +  std::string myId;  //Feature unique id\r
 +  std::string myText; //Represents action's text\r
 +  std::string myTooltip;  //Represents action's tooltip\r
 +  std::string myIcon; //Represents action's icon\r
 +  std::string myKeysequence;  //Represents action's key sequence\r
  \r
 -  std::string myId;\r
 -  std::string myText;\r
 -  std::string myTooltip;\r
 -  std::string myIcon;\r
 -  std::string myKeysequence;\r
 -\r
 -  std::string myGroupId;\r
 -  std::string myWorkbenchId;\r
 +  std::string myGroupId;  //Id of feature's group\r
 +  std::string myWorkbenchId;  //Id of feature's workbench\r
 +  std::string myPluginLibrary;  //Name of feature's library\r
  \r
  public:\r
    //const Event_ID theID, const void* theSender = 0\r
@@@ -46,7 -40,6 +46,7 @@@
  \r
    void setGroupId(const std::string& groupId);\r
    void setWorkbenchId(const std::string& workbenchId);\r
 +  void setPluginLibrary(const std::string& thePluginLibrary);\r
  };\r
  \r
- #endif // CONFIG_MESSAGE_H\r
 -#endif // CONFIG_MESSAGE_H
++#endif // CONFIG_MESSAGE_H

diff --cc src/Config/Config_FeatureReader.cpp
Simple merge

diff --cc src/Config/Config_XMLReader.cpp
Simple merge

diff --cc src/PartSet/PartSet_Module.cpp
Simple merge