Salome HOME
Merge from V6_main 13/12/2012 V7_1_0_pre
authorvsr <vsr@opencascade.com>
Thu, 13 Dec 2012 07:38:01 +0000 (07:38 +0000)
committervsr <vsr@opencascade.com>
Thu, 13 Dec 2012 07:38:01 +0000 (07:38 +0000)
commite5867636265822b5e70ca0406c9321ccff264bb0
treeae2855623aa1349e496a90e124441c6ea06efa54
parent134f40f06da8272c704fb8f71ef00904518dd112
Merge from V6_main 13/12/2012
73 files changed:
CMakeLists.txt
bin/CMakeLists.txt
bin/Makefile.am
bin/ORBConfigFile.py [new file with mode: 0644]
bin/appliskel/runRemote.sh
bin/appliskel/runSession
bin/appliskel/runTests
bin/appliskel/searchFreePort.sh
bin/killSalome.py
bin/killSalomeWithPort.py
bin/launchConfigureParser.py
bin/launchSalome.py
bin/orbmodule.py
bin/runSalome.ksh
bin/runSalome.py
bin/salomeConsole.py
bin/salome_session.py
bin/salome_utils.py
bin/searchFreePort.py [new file with mode: 0644]
bin/setenv.py
bin/shutdownSalome.py
doc/docutils/CMakeLists.txt [new file with mode: 0755]
doc/salome/gui/CMakeLists.txt
doc/salome/kernel_salome.dox
doc/salome/tui/CMakeLists.txt
doc/salome/tui/doxyfile.in
idl/SALOMEDS_Attributes.idl
idl/SALOME_Component.idl
salome_adm/CMakeLists.txt
salome_adm/cmake_files/FindPLATFORM.cmake
salome_adm/cmake_files/SalomeMacros.cmake
salome_adm/cmake_files/am2cmake.py
salome_adm/cmake_files/prepare_generating_doc.py
salome_adm/unix/CMakeLists.txt [new file with mode: 0755]
salome_adm/unix/config_files/CMakeLists.txt [new file with mode: 0755]
salome_adm/unix/config_files/check_cas.m4
src/Container/Component_i.cxx
src/Container/SALOME_ComponentPy.py
src/Container/SALOME_Component_i.hxx
src/Container/SALOME_ContainerManager.cxx
src/DSC/DSC_Python/calcium.i
src/DSC/DSC_User/Datastream/Calcium/CalciumC.c
src/DSC/DSC_User/Datastream/Calcium/CalciumCInterface.cxx
src/DSC/DSC_User/Datastream/Calcium/CalciumCInterface.hxx
src/DSC/DSC_User/Datastream/Calcium/calcium.h
src/DSC/DSC_User/Datastream/Calcium/calciumf.c
src/DSC/DSC_User/Datastream/Calcium/calciumf.h
src/KERNEL_PY/salome_study.py
src/Launcher/BatchTest.cxx
src/Launcher/Launcher.cxx
src/Launcher/Launcher_Job_Command.cxx
src/Launcher/Launcher_Job_SALOME.cxx
src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx
src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx
src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
src/ResourcesManager/SALOME_ResourcesManager.cxx
src/SALOMEDS/Makefile.am
src/SALOMEDS/SALOMEDS_AttributeStudyProperties.cxx
src/SALOMEDS/SALOMEDS_AttributeStudyProperties.hxx
src/SALOMEDS/SALOMEDS_AttributeStudyProperties_i.cxx
src/SALOMEDS/SALOMEDS_AttributeStudyProperties_i.hxx
src/SALOMEDS/SALOMEDS_Driver_i.cxx
src/SALOMEDS/SALOMEDS_Driver_i.hxx
src/SALOMEDS/SALOMEDS_StudyBuilder.cxx
src/SALOMEDS/SALOMEDS_StudyManager.cxx
src/SALOMEDS/SALOMEDS_StudyManager_i.cxx
src/SALOMEDS/SALOME_DriverPy.py
src/SALOMEDSClient/SALOMEDSClient_AttributeStudyProperties.hxx
src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx
src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.hxx
src/SALOMEDSImpl/SALOMEDSImpl_Driver.hxx
src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx