]> SALOME platform Git repositories - modules/gui.git/commitdiff
Salome HOME
Merge tag 'V8_3_0a2' into ngr/python3_dev
authorNicolas Geimer <nicolas.geimer@edf.fr>
Mon, 20 Mar 2017 17:19:04 +0000 (18:19 +0100)
committerNicolas Geimer <nicolas.geimer@edf.fr>
Mon, 20 Mar 2017 17:19:04 +0000 (18:19 +0100)
Version 8.3.0 alpha 2

1  2 
src/LightApp/LightApp_Application.cxx
src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx
src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.cxx
src/SalomeApp/SalomeApp_Study.cxx
src/Session/SALOME_Session_Server.cxx

Simple merge
index 0e8a5804907345bdc6691ba057f2668aa2761b82,9e53d0350ef7e5e232a180645bc2e578e391fe66..a72dd69cac63a186876dc3099efa41e6bf52e22e
  // File   : SALOME_PYQT_ModuleLight.cxx
  // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
  
 -#include "SALOME_PYQT_DataModelLight.h"
  #include "SALOME_PYQT_ModuleLight.h"
 +#include "SALOME_PYQT_DataModelLight.h"
  #include "SALOME_PYQT_PyModule.h"
+ #include "SALOME_PYQT_Selector.h"
  
  #include "CAM_Application.h"
  #include "SUITApp_init_python.hxx"
Simple merge
Simple merge