From: vsv <vitaly.smetannikov@opencascade.com>
Date: Fri, 28 Nov 2014 16:22:44 +0000 (+0300)
Subject: Merge branch 'Dev_0.6' of newgeom:newgeom into Dev_0.6
X-Git-Tag: V_0.6.0^2~47
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d0cbbcaf8210321d065b0cf54a33288c8d77e462;p=modules%2Fshaper.git

Merge branch 'Dev_0.6' of newgeom:newgeom into Dev_0.6

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

d0cbbcaf8210321d065b0cf54a33288c8d77e462
diff --cc src/PartSet/PartSet_Module.cpp
index 44deb41e4,e2b7ccc05..9ced217aa
--- a/src/PartSet/PartSet_Module.cpp
+++ b/src/PartSet/PartSet_Module.cpp
@@@ -53,18 -47,6 +47,7 @@@
  #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>