]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Merge branch 'Dev_0.6' of newgeom:newgeom into Dev_0.6
authorvsv <vitaly.smetannikov@opencascade.com>
Fri, 28 Nov 2014 16:22:44 +0000 (19:22 +0300)
committervsv <vitaly.smetannikov@opencascade.com>
Fri, 28 Nov 2014 16:22:44 +0000 (19:22 +0300)
Conflicts:
src/PartSet/PartSet_Module.cpp

1  2 
src/PartSet/PartSet_Module.cpp

index 44deb41e4c973388160362226e2863c303a54b4d,e2b7ccc052e4b5beecc3e6754d1ba57001b8ba3b..9ced217aa2e12849bfe9cd70a957f7fe63590b47
  #include <SketchPlugin_ConstraintRadius.h>
  #include <SketchPlugin_ConstraintRigid.h>
  
- //#include <Config_PointerMessage.h>
- //#include <Config_ModuleReader.h>
- //#include <Config_WidgetReader.h>
 +#include <Events_Loop.h>
- //#include <Events_Message.h>
- //#include <Events_Error.h>
- //#include <GeomAPI_Shape.h>
- //#include <GeomAPI_AISObject.h>
- //#include <AIS_Shape.hxx>
- //#include <AIS_DimensionSelectionMode.hxx>
  #include <StdSelect_TypeOfFace.hxx>
  
  #include <QObject>