From: vsv <vitaly.smetannikov@opencascade.com>
Date: Tue, 29 Apr 2014 14:07:20 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom
X-Git-Tag: V_0.2~104
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=20a291604881eb90b02e85cc3d97562c513b9471;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom
---

20a291604881eb90b02e85cc3d97562c513b9471
diff --cc src/XGUI/XGUI_ActionsMgr.h
index 194412ec1,dd5ac36f7..336af1a0b
--- a/src/XGUI/XGUI_ActionsMgr.h
+++ b/src/XGUI/XGUI_ActionsMgr.h
@@@ -10,10 -12,9 +12,10 @@@
  #include <QStringList>
  
  class XGUI_Command;
 +class XGUI_Workshop;
  class QAction;
  
- class XGUI_ActionsMgr: public QObject
+ class XGUI_EXPORT XGUI_ActionsMgr: public QObject
  {
    Q_OBJECT