Salome HOME
Merge branch 'V7_dev'
authorvsr <vsr@opencascade.com>
Thu, 24 Mar 2016 10:17:35 +0000 (13:17 +0300)
committervsr <vsr@opencascade.com>
Thu, 24 Mar 2016 10:17:35 +0000 (13:17 +0300)
commite429ce02076e083051c6520e0d7113022bd67b18
treedbdb5b2bd63ad7b5b6e707f43938cd6703b53edd
parent8fa75554f6552da96fb4cd1cced02e307678ac88
parentca8937c5b013c50c00e30d38ae22a0ba26ef51c2
Merge branch 'V7_dev'
32 files changed:
CMakeLists.txt
CTestTestfileInstall.cmake.in
bin/appliskel/tests/concurrentSession/CTestTestfileInstall.cmake
bin/appliskel/tests/salomeCommand/CTestTestfileInstall.cmake
bin/appliskel/tests/salomeInstance/CTestTestfileInstall.cmake
bin/runTests.py
idl/SALOME_Launcher.idl
salome_adm/cmake_files/CMakeLists.txt
salome_adm/cmake_files/SalomeSetupPlatform.cmake
salome_adm/cmake_files/deprecated/am2cmake.py
src/AppQuickStart/app-template/CMakeLists.txt
src/AppQuickStart/app-template/src/resources/CMakeLists.txt
src/Basics/Basics_Utils.hxx
src/KernelHelpers/Test/CTestTestfileInstall.cmake
src/Launcher/Launcher_Job_YACSFile.cxx
src/Launcher/Launcher_Job_YACSFile.hxx
src/Launcher/Test/CTestTestfileInstall.cmake
src/LifeCycleCORBA/Test/CTestTestfileInstall.cmake
src/LifeCycleCORBA_SWIG/Test/CTestTestfileInstall.cmake
src/NamingService/Test/CTestTestfileInstall.cmake
src/ResourcesManager/ResourcesManager.cxx
src/SALOMEDS/Test/CTestTestfileInstall.cmake
src/SALOMEDS/Test/SALOMEDSTest_AttributeComment.cxx
src/SALOMEDS/Test/SALOMEDSTest_SObject.cxx
src/SALOMEDS/Test/SALOMEDSTest_Study.cxx
src/SALOMEDS/Test/SALOMEDSTest_StudyManager.cxx
src/SALOMEDSImpl/Test/CTestTestfileInstall.cmake
src/SALOMELocalTrace/Test/CTestTestfileInstall.cmake
src/SALOMESDS/CTestTestfileInstall.cmake
src/SALOMETraceCollector/Test/CTestTestfileInstall.cmake
src/UnitTests/CTestTestfileInstall.cmake
src/Utils/Test/CTestTestfileInstall.cmake