Salome HOME
Merge changes from 'master' branch.
authorrnv <rnv@opencascade.com>
Mon, 25 Dec 2017 15:51:30 +0000 (18:51 +0300)
committerrnv <rnv@opencascade.com>
Fri, 29 Dec 2017 13:33:47 +0000 (16:33 +0300)
commit855f4002aa71d468682a50c484a19579a51bf78c
treefdb821f27c5d05a5a69e47b2df916162f71db290
parented578d0a1ce14393892058c405be6465311fa57f
parent6d06313695b08b46989753b55c9f063552789d97
Merge changes from 'master' branch.
12 files changed:
CMakeLists.txt
SalomeGUIConfig.cmake.in
bin/gui_setenv.py
src/LightApp/LightApp_Application.cxx
src/LightApp/LightApp_Application.h
src/LightApp/resources/LightApp_msg_fr.ts
src/LightApp/resources/LightApp_msg_ja.ts
src/SALOME_SWIG/SALOMEGUI_Swig.cxx
src/SalomeApp/SalomeApp_Engine_i.cxx
src/SalomeApp/SalomeApp_Engine_i.h
src/SalomeApp/SalomeApp_Study.cxx
src/Session/SALOME_Session_Server.cxx