From: vsv <vitaly.smetannikov@opencascade.com>
Date: Fri, 4 Apr 2014 08:39:10 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom
X-Git-Tag: V_0.1~31^2~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=637bc35625b89379def6b9f9ff0915d32664babd;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom

Conflicts:
	src/XGUI/XGUI_Workshop.cpp
---

637bc35625b89379def6b9f9ff0915d32664babd
diff --cc src/XGUI/XGUI_Workshop.cpp
index 7f936b82c,ecf852496..8b3fd9ac3
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@@ -7,12 -7,11 +7,14 @@@
  #include "XGUI_Workbench.h"
  #include "XGUI_Workshop.h"
  #include "XGUI_Viewer.h"
+ #include "XGUI_WidgetFactory.h"
  
 +#include <ModelAPI_PluginManager.h>
 +#include <ModelAPI_Feature.h>
 +
- #include <Config_FeatureMessage.h>
  #include <Event_Loop.h>
+ #include <Config_FeatureMessage.h>
+ #include <Config_WidgetMessage.h>
  
  #include <QApplication>
  #include <QFileDialog>