]> SALOME platform Git repositories - modules/geom.git/commitdiff
Salome HOME
Merge branch 'fbt/add_header_for_mpi_compilation'
authorFlorian BRUNET <FB15EB3N@dsp0657834.(none)>
Wed, 11 Feb 2015 10:47:52 +0000 (11:47 +0100)
committerFlorian BRUNET <FB15EB3N@dsp0657834.(none)>
Wed, 11 Feb 2015 10:47:52 +0000 (11:47 +0100)
1  2 
src/EntityGUI/EntityGUI_PolylineDlg.cxx
src/EntityGUI/EntityGUI_SketcherDlg.cxx
src/GEOMBase/GEOMBase_Helper.cxx
src/GEOMGUI/GEOM_Displayer.cxx
src/GroupGUI/GroupGUI_GroupDlg.cxx
src/RepairGUI/RepairGUI_GlueDlg.cxx
src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx
src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx

index 59b65f34c93c13ab2885a4bccae3adbb11c315f2,838f92385ac74ee11cea0296b60c0fa669cd27f0..d94eed0cd67815dd08f50f16aa1ec71025fa2f4c
  #include <LightApp_DataOwner.h>
  #include <SalomeApp_Tools.h>
  #include <SALOME_ListIO.hxx>
+ #include "utilities.h"
  
  #include <SALOME_Prs.h>
 +#include "utilities.h"
  
  #include <OCCViewer_ViewModel.h>
  #include <SVTK_ViewModel.h>
Simple merge
Simple merge
Simple merge
index 3467da10ca1ce163705ad88d88882221a6d013be,187dcd560e31ce88ee7c8057900c8bf31fce12dc..f1ac35604ce3cf457d61c8ee2c5b58c675ae299d
  #include <SUIT_ResourceMgr.h>
  #include <SUIT_MessageBox.h>
  #include <SALOME_ListIO.hxx>
+ #include "utilities.h"
  
  #include <Basics_Utils.hxx>
 +#include "utilities.h"
  
  #include <TCollection_AsciiString.hxx>
  #include <TColStd_MapOfInteger.hxx>