From: vsv <vitaly.smetannikov@opencascade.com>
Date: Tue, 1 Jul 2014 07:41:54 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom
X-Git-Tag: V_0.4.4~214
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=12621bb509825d0eb1fb0847a7f9c8011021ca5a;p=modules%2Fshaper.git

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

12621bb509825d0eb1fb0847a7f9c8011021ca5a
diff --cc src/PartSet/PartSet_Listener.cpp
index fb4c4fad3,0a8a6e9d4..f9229d383
--- a/src/PartSet/PartSet_Listener.cpp
+++ b/src/PartSet/PartSet_Listener.cpp
@@@ -7,10 -7,9 +7,10 @@@
  #include <PartSet_Module.h>
  
  #include <XGUI_Displayer.h>
 +#include <XGUI_Workshop.h>
  
  #include <Events_Loop.h>
- #include <Model_Events.h>
+ #include <ModelAPI_Events.h>
  
  #include <SketchPlugin_Sketch.h>