]> SALOME platform Git repositories - modules/kernel.git/commit
Salome HOME
rollback merge error (sorry guys...)
authoraguerre <aguerre>
Tue, 28 May 2013 16:55:31 +0000 (16:55 +0000)
committeraguerre <aguerre>
Tue, 28 May 2013 16:55:31 +0000 (16:55 +0000)
commitbbac39ee34bd6a5e6fd051024209399b97b818b1
tree5c0ef821c879431a7d83b282764f5a5acab4ade1
parentd9904f7ff3e87d82347311c61b53d3127f587fe0
rollback merge error (sorry guys...)
218 files changed:
CMakeLists.txt [deleted file]
Makefile.am
bin/CMakeLists.txt [deleted file]
bin/Makefile.am
bin/NSparam.py
bin/ORBConfigFile.py [deleted file]
bin/appli_gen.py
bin/appli_install.sh [new file with mode: 0644]
bin/appliskel/.bashrc
bin/appliskel/CMakeLists.txt [deleted file]
bin/appliskel/Makefile.am
bin/appliskel/getAppliPath.py
bin/appliskel/runRemote.sh
bin/appliskel/runSession
bin/appliskel/runTests [new file with mode: 0755]
bin/appliskel/salome.py [deleted file]
bin/appliskel/searchFreePort.sh [new file with mode: 0755]
bin/config_appli.xml [new file with mode: 0644]
bin/createAppli.sh [new file with mode: 0755]
bin/killSalome.py
bin/killSalomeWithPort.py
bin/launchConfigureParser.py
bin/launchSalome.py [new file with mode: 0755]
bin/orbmodule.py
bin/parseConfigFile.py [deleted file]
bin/runConsole.py [deleted file]
bin/runNS.py [new file with mode: 0755]
bin/runNS.sh [new file with mode: 0755]
bin/runSalome [new file with mode: 0755]
bin/runSalome.bat [new file with mode: 0644]
bin/runSalome.csh [new file with mode: 0755]
bin/runSalome.ksh [new file with mode: 0644]
bin/runSalome.py
bin/runSession.py [deleted file]
bin/salome.launch [new file with mode: 0644]
bin/salomeConsole.py
bin/salomeRunner.py [deleted file]
bin/salome_session.py
bin/salome_utils.py
bin/searchFreePort.py [deleted file]
bin/setenv.py
bin/shutdownSalome.py
bin/waitNS.sh [new file with mode: 0755]
configure.ac
doc/CMakeLists.txt [deleted file]
doc/Makefile.am
doc/docutils/CMakeLists.txt [deleted file]
doc/docutils/Makefile.am
doc/docutils/archives/KERNEL_Services.txt
doc/docutils/archives/SALOME_Application.txt
doc/docutils/archives/txt2html.sh
doc/docutils/archives/userguide.txt
doc/salome/CMakeLists.txt [deleted file]
doc/salome/Makefile.am
doc/salome/gui/CMakeLists.txt [deleted file]
doc/salome/gui/Makefile.am
doc/salome/gui/images/icon_about.png
doc/salome/kernel_salome.dox
doc/salome/main.dox
doc/salome/running_salome.dox [deleted file]
doc/salome/tui/CMakeLists.txt [deleted file]
doc/salome/tui/Makefile.am
doc/salome/tui/doxyfile.in
idl/CMakeLists.txt [deleted file]
idl/Makefile.am
idl/SALOMEDS_Attributes.idl
idl/SALOME_Component.idl
resources/CMakeLists.txt [deleted file]
resources/Makefile.am
salome_adm/CMakeLists.txt [deleted file]
salome_adm/Makefile.am
salome_adm/SALOMEconfig.ref.in [deleted file]
salome_adm/cmake_files/CMakeLists.txt [deleted file]
salome_adm/cmake_files/FindCPPUNIT.cmake
salome_adm/cmake_files/FindLIBBATCH.cmake
salome_adm/cmake_files/FindMPI.cmake
salome_adm/cmake_files/FindPLATFORM.cmake
salome_adm/cmake_files/FindPTHREADS.cmake
salome_adm/cmake_files/FindSPHINX.cmake
salome_adm/cmake_files/Makefile.am
salome_adm/cmake_files/SalomeMacros.cmake [deleted file]
salome_adm/cmake_files/UseOMNIORB.cmake
salome_adm/cmake_files/am2cmake.py
salome_adm/cmake_files/prepare_generating_doc.py
salome_adm/unix/CMakeLists.txt [deleted file]
salome_adm/unix/Makefile.am
salome_adm/unix/config_files/CMakeLists.txt [deleted file]
salome_adm/unix/config_files/check_boost.m4
salome_adm/unix/config_files/check_cas.m4
salome_adm/unix/make_common_starter.am
src/Basics/Basics_Utils.cxx
src/Basics/Basics_Utils.hxx
src/Basics/CMakeLists.txt [deleted file]
src/Basics/Test/CMakeLists.txt [deleted file]
src/CMakeLists.txt [deleted file]
src/Communication/CMakeLists.txt [deleted file]
src/Communication/Makefile.am
src/Communication_SWIG/CMakeLists.txt [deleted file]
src/Communication_SWIG/Makefile.am
src/Container/CMakeLists.txt [deleted file]
src/Container/Component_i.cxx
src/Container/Makefile.am
src/Container/SALOME_ComponentPy.py
src/Container/SALOME_Component_i.hxx
src/Container/SALOME_ContainerManager.cxx
src/Container/SALOME_ContainerPy.py [new file with mode: 0755]
src/DF/CMakeLists.txt [deleted file]
src/DSC/CMakeLists.txt [deleted file]
src/DSC/DSC_Basic/CMakeLists.txt [deleted file]
src/DSC/DSC_Python/CMakeLists.txt [deleted file]
src/DSC/DSC_Python/Makefile.am
src/DSC/DSC_Python/calcium.i
src/DSC/DSC_User/Basic/CMakeLists.txt [deleted file]
src/DSC/DSC_User/CMakeLists.txt [deleted file]
src/DSC/DSC_User/Datastream/CMakeLists.txt [deleted file]
src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt [deleted file]
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/Makefile.am
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/DSC/DSC_User/Datastream/Palm/CMakeLists.txt [deleted file]
src/DSC/Makefile.am
src/DSC/ParallelDSC/CMakeLists.txt [deleted file]
src/GenericObj/CMakeLists.txt [deleted file]
src/HDFPersist/CMakeLists.txt [deleted file]
src/HDFPersist/HDFascii.cc
src/HDFPersist/Makefile.am
src/KERNEL_PY/CMakeLists.txt [deleted file]
src/KERNEL_PY/kernel/CMakeLists.txt [deleted file]
src/KERNEL_PY/kernel/parametric/CMakeLists.txt [deleted file]
src/KERNEL_PY/salome.py [new file with mode: 0755]
src/KERNEL_PY/salome_study.py
src/KernelHelpers/CMakeLists.txt [deleted file]
src/KernelHelpers/Test/CMakeLists.txt [deleted file]
src/KernelHelpers/Test/KernelHelpersUnitTests.hxx
src/Launcher/BatchTest.cxx
src/Launcher/CMakeLists.txt [deleted file]
src/Launcher/Launcher.cxx
src/Launcher/Launcher_Job_Command.cxx
src/Launcher/Launcher_Job_SALOME.cxx
src/LifeCycleCORBA/CMakeLists.txt [deleted file]
src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
src/LifeCycleCORBA/Test/CMakeLists.txt [deleted file]
src/LifeCycleCORBA/Test/LifeCycleCORBATest.cxx
src/LifeCycleCORBA/Test/LifeCycleCORBATest.hxx
src/LifeCycleCORBA_SWIG/CMakeLists.txt [deleted file]
src/LifeCycleCORBA_SWIG/Makefile.am
src/LifeCycleCORBA_SWIG/Test/CMakeLists.txt [deleted file]
src/Logger/CMakeLists.txt [deleted file]
src/Logger/Test/CMakeLists.txt [deleted file]
src/MPIContainer/CMakeLists.txt [deleted file]
src/MPIContainer/MPIContainer_i.cxx
src/Makefile.am
src/ModuleCatalog/CMakeLists.txt [deleted file]
src/ModuleGenerator/CMakeLists.txt [deleted file]
src/ModuleGenerator/Makefile.am
src/NOTIFICATION_SWIG/CMakeLists.txt [deleted file]
src/NOTIFICATION_SWIG/Makefile.am
src/NamingService/CMakeLists.txt [deleted file]
src/NamingService/Test/CMakeLists.txt [deleted file]
src/NamingService/Test/NamingServiceTest.cxx
src/NamingService/Test/NamingServiceTest.hxx
src/Notification/CMakeLists.txt [deleted file]
src/ParallelContainer/CMakeLists.txt [deleted file]
src/Registry/CMakeLists.txt [deleted file]
src/ResourcesManager/CMakeLists.txt [deleted file]
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/CMakeLists.txt [deleted file]
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/SALOMEDS/Test/CMakeLists.txt [deleted file]
src/SALOMEDS/Test/Makefile.am
src/SALOMEDS/Test/SALOMEDSTest.hxx
src/SALOMEDS/Test/TestSALOMEDS.cxx
src/SALOMEDSClient/CMakeLists.txt [deleted file]
src/SALOMEDSClient/SALOMEDSClient_AttributeStudyProperties.hxx
src/SALOMEDSImpl/CMakeLists.txt [deleted file]
src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx
src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.hxx
src/SALOMEDSImpl/SALOMEDSImpl_Driver.hxx
src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx
src/SALOMEDSImpl/SALOMEDSImpl_UseCaseBuilder.cxx
src/SALOMEDSImpl/Test/CMakeLists.txt [deleted file]
src/SALOMEDSImpl/Test/SALOMEDSImplTest.hxx
src/SALOMELocalTrace/CMakeLists.txt [deleted file]
src/SALOMELocalTrace/Test/CMakeLists.txt [deleted file]
src/SALOMELocalTrace/Test/SALOMELocalTraceTest.cxx
src/SALOMELocalTrace/Test/SALOMELocalTraceTest.hxx
src/SALOMETraceCollector/CMakeLists.txt [deleted file]
src/SALOMETraceCollector/Test/CMakeLists.txt [deleted file]
src/SALOMETraceCollector/Test/SALOMETraceCollectorTest.cxx
src/SALOMETraceCollector/Test/SALOMETraceCollectorTest.hxx
src/TOOLSDS/CMakeLists.txt [deleted file]
src/TestContainer/CMakeLists.txt [deleted file]
src/TestContainer/Makefile.am
src/TestContainer/TestComponentPy.py [new file with mode: 0755]
src/TestMPIContainer/CMakeLists.txt [deleted file]
src/UnitTests/CMakeLists.txt [deleted file]
src/Utils/CMakeLists.txt [deleted file]
src/Utils/Test/CMakeLists.txt [deleted file]
src/Utils/Test/TestUtils.py
src/Utils/Test/UtilsTest.cxx
src/Utils/Test/UtilsTest.hxx