From: nds <natalia.donis@opencascade.com>
Date: Thu, 30 Apr 2015 14:23:54 +0000 (+0300)
Subject: Merge branch 'Dev_1.2.0' of newgeom:newgeom into Dev_1.2.0
X-Git-Tag: V_1.2.0~177^2~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8e54aaa6560497708620242e7f99a0d8e58366f7;p=modules%2Fshaper.git

Merge branch 'Dev_1.2.0' of newgeom:newgeom into Dev_1.2.0

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

8e54aaa6560497708620242e7f99a0d8e58366f7
diff --cc src/PartSet/PartSet_Module.cpp
index 74ca6f834,e32bba643..8fc18d64c
--- a/src/PartSet/PartSet_Module.cpp
+++ b/src/PartSet/PartSet_Module.cpp
@@@ -1,17 -1,20 +1,21 @@@
  // Copyright (C) 2014-20xx CEA/DEN, EDF R&D
  
  #include "PartSet_Module.h"
- #include <PartSet_WidgetSketchLabel.h>
- #include <PartSet_Validators.h>
- #include <PartSet_Tools.h>
- #include <PartSet_WidgetPoint2d.h>
- #include <PartSet_WidgetPoint2dDistance.h>
- #include <PartSet_WidgetPoint2dAngle.h>
- #include <PartSet_WidgetShapeSelector.h>
- #include <PartSet_WidgetMultiSelector.h>
- #include <PartSet_WidgetEditor.h>
+ #include "PartSet_WidgetSketchLabel.h"
+ #include "PartSet_Validators.h"
+ #include "PartSet_Tools.h"
+ #include "PartSet_WidgetPoint2d.h"
+ #include "PartSet_WidgetPoint2dDistance.h"
+ #include "PartSet_WidgetShapeSelector.h"
++#include "PartSet_WidgetPoint2dAngle.h"
+ #include "PartSet_WidgetMultiSelector.h"
+ #include "PartSet_WidgetEditor.h"
  #include "PartSet_SketcherMgr.h"
  #include "PartSet_MenuMgr.h"
+ #include "PartSet_DocumentDataModel.h"
+ 
+ #include <PartSetPlugin_Remove.h>
+ #include <PartSetPlugin_Part.h>
  
  #include <ModuleBase_Operation.h>
  #include <ModuleBase_IViewer.h>