]> SALOME platform Git repositories - modules/kernel.git/commit
Salome HOME
Merge from V6_main
authorbarate <barate>
Mon, 6 Feb 2012 10:20:59 +0000 (10:20 +0000)
committerbarate <barate>
Mon, 6 Feb 2012 10:20:59 +0000 (10:20 +0000)
commit0bf92898aada869831ebcd17784c565e1233c587
tree4e6c28ef9e9fbb948ed41e5b63327451b08b3162
parent837b04e550fd4a890a91ab153d63810f1f97e9fc
Merge from V6_main
23 files changed:
bin/launchConfigureParser.py
bin/runSalome.py
bin/server.py
salome_adm/cmake_files/FindSPHINX.cmake [new file with mode: 0755]
salome_adm/cmake_files/Makefile.am
salome_adm/cmake_files/am2cmake.py
salome_adm/cmake_files/prepare_generating_doc.py [new file with mode: 0755]
src/Container/SALOME_ContainerManager.cxx
src/Container/SALOME_ContainerManager.hxx
src/Container/SALOME_ContainerPy.py
src/KERNEL_PY/__init__.py
src/KERNEL_PY/kernel/parametric/study_exchange_vars.py
src/KERNEL_PY/kernel/services.py
src/Launcher/Launcher_Job.cxx
src/Launcher/Launcher_Job_SALOME.cxx
src/Launcher/Makefile.am
src/ResourcesManager/Makefile.am
src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx
src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx
src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
src/ResourcesManager/SALOME_ResourcesManager.cxx
src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx
src/SALOMEDSImpl/SALOMEDSImpl_Tool.cxx