From: rnv <rnv@opencascade.com>
Date: Thu, 28 Dec 2017 15:13:11 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/master' into V9_dev
X-Git-Tag: V9_0_0^0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b871c3e20e331915e4534dcaffc1f0eab8f809d5;p=modules%2Fhexablock.git

Merge remote-tracking branch 'origin/master' into V9_dev
---

b871c3e20e331915e4534dcaffc1f0eab8f809d5
diff --cc src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.cxx
index 50737ef,2fed0c5..1dae5ca
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.cxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.cxx
@@@ -28,10 -28,9 +28,8 @@@
  #include <vtkActorCollection.h>
  #include <vtkUnstructuredGrid.h>
  
- #include <Basics_OCCTVersion.hxx>
- 
  #include <SUIT_Session.h>
  
 -#include <SalomeApp_Study.h>
  #include <SalomeApp_Application.h>
  
  #include <OCCViewer_ViewWindow.h>