SALOME platform Git repositories - modules/kernel.git/commit

]> SALOME platform Git repositories - modules/kernel.git/commit - src/Makefile.am

projects / modules / kernel.git / commit

author	aguerre <aguerre>
	Tue, 28 May 2013 16:55:31 +0000 (16:55 +0000)
committer	aguerre <aguerre>
	Tue, 28 May 2013 16:55:31 +0000 (16:55 +0000)
commit	bbac39ee34bd6a5e6fd051024209399b97b818b1
tree	5c0ef821c879431a7d83b282764f5a5acab4ade1	tree \| snapshot
parent	d9904f7ff3e87d82347311c61b53d3127f587fe0	commit \| diff

rollback merge error (sorry guys...)

218 files changed:

CMakeLists.txt	[deleted file]	blob \| history
Makefile.am		diff \| blob \| history
bin/CMakeLists.txt	[deleted file]	blob \| history
bin/Makefile.am		diff \| blob \| history
bin/NSparam.py		diff \| blob \| history
bin/ORBConfigFile.py	[deleted file]	blob \| history
bin/appli_gen.py		diff \| blob \| history
bin/appli_install.sh	[new file with mode: 0644]	blob
bin/appliskel/.bashrc		diff \| blob \| history
bin/appliskel/CMakeLists.txt	[deleted file]	blob \| history
bin/appliskel/Makefile.am		diff \| blob \| history
bin/appliskel/getAppliPath.py		diff \| blob \| history
bin/appliskel/runRemote.sh		diff \| blob \| history
bin/appliskel/runSession		diff \| blob \| history
bin/appliskel/runTests	[new file with mode: 0755]	blob
bin/appliskel/salome.py	[deleted file]	blob \| history
bin/appliskel/searchFreePort.sh	[new file with mode: 0755]	blob
bin/config_appli.xml	[new file with mode: 0644]	blob
bin/createAppli.sh	[new file with mode: 0755]	blob
bin/killSalome.py		diff \| blob \| history
bin/killSalomeWithPort.py		diff \| blob \| history
bin/launchConfigureParser.py		diff \| blob \| history
bin/launchSalome.py	[new file with mode: 0755]	blob
bin/orbmodule.py		diff \| blob \| history
bin/parseConfigFile.py	[deleted file]	blob \| history
bin/runConsole.py	[deleted file]	blob \| history
bin/runNS.py	[new file with mode: 0755]	blob
bin/runNS.sh	[new file with mode: 0755]	blob
bin/runSalome	[new file with mode: 0755]	blob
bin/runSalome.bat	[new file with mode: 0644]	blob
bin/runSalome.csh	[new file with mode: 0755]	blob
bin/runSalome.ksh	[new file with mode: 0644]	blob
bin/runSalome.py		diff \| blob \| history
bin/runSession.py	[deleted file]	blob \| history
bin/salome.launch	[new file with mode: 0644]	blob
bin/salomeConsole.py		diff \| blob \| history
bin/salomeRunner.py	[deleted file]	blob \| history
bin/salome_session.py		diff \| blob \| history
bin/salome_utils.py		diff \| blob \| history
bin/searchFreePort.py	[deleted file]	blob \| history
bin/setenv.py		diff \| blob \| history
bin/shutdownSalome.py		diff \| blob \| history
bin/waitNS.sh	[new file with mode: 0755]	blob
configure.ac		diff \| blob \| history
doc/CMakeLists.txt	[deleted file]	blob \| history
doc/Makefile.am		diff \| blob \| history
doc/docutils/CMakeLists.txt	[deleted file]	blob \| history
doc/docutils/Makefile.am		diff \| blob \| history
doc/docutils/archives/KERNEL_Services.txt		diff \| blob \| history
doc/docutils/archives/SALOME_Application.txt		diff \| blob \| history
doc/docutils/archives/txt2html.sh		diff \| blob \| history
doc/docutils/archives/userguide.txt		diff \| blob \| history
doc/salome/CMakeLists.txt	[deleted file]	blob \| history
doc/salome/Makefile.am		diff \| blob \| history
doc/salome/gui/CMakeLists.txt	[deleted file]	blob \| history
doc/salome/gui/Makefile.am		diff \| blob \| history
doc/salome/gui/images/icon_about.png		diff \| blob \| history
doc/salome/kernel_salome.dox		diff \| blob \| history
doc/salome/main.dox		diff \| blob \| history
doc/salome/running_salome.dox	[deleted file]	blob \| history
doc/salome/tui/CMakeLists.txt	[deleted file]	blob \| history
doc/salome/tui/Makefile.am		diff \| blob \| history
doc/salome/tui/doxyfile.in		diff \| blob \| history
idl/CMakeLists.txt	[deleted file]	blob \| history
idl/Makefile.am		diff \| blob \| history
idl/SALOMEDS_Attributes.idl		diff \| blob \| history
idl/SALOME_Component.idl		diff \| blob \| history
resources/CMakeLists.txt	[deleted file]	blob \| history
resources/Makefile.am		diff \| blob \| history
salome_adm/CMakeLists.txt	[deleted file]	blob \| history
salome_adm/Makefile.am		diff \| blob \| history
salome_adm/SALOMEconfig.ref.in	[deleted file]	blob \| history
salome_adm/cmake_files/CMakeLists.txt	[deleted file]	blob \| history
salome_adm/cmake_files/FindCPPUNIT.cmake		diff \| blob \| history
salome_adm/cmake_files/FindLIBBATCH.cmake		diff \| blob \| history
salome_adm/cmake_files/FindMPI.cmake		diff \| blob \| history
salome_adm/cmake_files/FindPLATFORM.cmake		diff \| blob \| history
salome_adm/cmake_files/FindPTHREADS.cmake		diff \| blob \| history
salome_adm/cmake_files/FindSPHINX.cmake		diff \| blob \| history
salome_adm/cmake_files/Makefile.am		diff \| blob \| history
salome_adm/cmake_files/SalomeMacros.cmake	[deleted file]	blob \| history
salome_adm/cmake_files/UseOMNIORB.cmake		diff \| blob \| history
salome_adm/cmake_files/am2cmake.py		diff \| blob \| history
salome_adm/cmake_files/prepare_generating_doc.py		diff \| blob \| history
salome_adm/unix/CMakeLists.txt	[deleted file]	blob \| history
salome_adm/unix/Makefile.am		diff \| blob \| history
salome_adm/unix/config_files/CMakeLists.txt	[deleted file]	blob \| history
salome_adm/unix/config_files/check_boost.m4		diff \| blob \| history
salome_adm/unix/config_files/check_cas.m4		diff \| blob \| history
salome_adm/unix/make_common_starter.am		diff \| blob \| history
src/Basics/Basics_Utils.cxx		diff \| blob \| history
src/Basics/Basics_Utils.hxx		diff \| blob \| history
src/Basics/CMakeLists.txt	[deleted file]	blob \| history
src/Basics/Test/CMakeLists.txt	[deleted file]	blob \| history
src/CMakeLists.txt	[deleted file]	blob \| history
src/Communication/CMakeLists.txt	[deleted file]	blob \| history
src/Communication/Makefile.am		diff \| blob \| history
src/Communication_SWIG/CMakeLists.txt	[deleted file]	blob \| history
src/Communication_SWIG/Makefile.am		diff \| blob \| history
src/Container/CMakeLists.txt	[deleted file]	blob \| history
src/Container/Component_i.cxx		diff \| blob \| history
src/Container/Makefile.am		diff \| blob \| history
src/Container/SALOME_ComponentPy.py		diff \| blob \| history
src/Container/SALOME_Component_i.hxx		diff \| blob \| history
src/Container/SALOME_ContainerManager.cxx		diff \| blob \| history
src/Container/SALOME_ContainerPy.py	[new file with mode: 0755]	blob
src/DF/CMakeLists.txt	[deleted file]	blob \| history
src/DSC/CMakeLists.txt	[deleted file]	blob \| history
src/DSC/DSC_Basic/CMakeLists.txt	[deleted file]	blob \| history
src/DSC/DSC_Python/CMakeLists.txt	[deleted file]	blob \| history
src/DSC/DSC_Python/Makefile.am		diff \| blob \| history
src/DSC/DSC_Python/calcium.i		diff \| blob \| history
src/DSC/DSC_User/Basic/CMakeLists.txt	[deleted file]	blob \| history
src/DSC/DSC_User/CMakeLists.txt	[deleted file]	blob \| history
src/DSC/DSC_User/Datastream/CMakeLists.txt	[deleted file]	blob \| history
src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt	[deleted file]	blob \| history
src/DSC/DSC_User/Datastream/Calcium/CalciumC.c		diff \| blob \| history
src/DSC/DSC_User/Datastream/Calcium/CalciumCInterface.cxx		diff \| blob \| history
src/DSC/DSC_User/Datastream/Calcium/CalciumCInterface.hxx		diff \| blob \| history
src/DSC/DSC_User/Datastream/Calcium/Makefile.am		diff \| blob \| history
src/DSC/DSC_User/Datastream/Calcium/calcium.h		diff \| blob \| history
src/DSC/DSC_User/Datastream/Calcium/calciumf.c		diff \| blob \| history
src/DSC/DSC_User/Datastream/Calcium/calciumf.h		diff \| blob \| history
src/DSC/DSC_User/Datastream/Palm/CMakeLists.txt	[deleted file]	blob \| history
src/DSC/Makefile.am		diff \| blob \| history
src/DSC/ParallelDSC/CMakeLists.txt	[deleted file]	blob \| history
src/GenericObj/CMakeLists.txt	[deleted file]	blob \| history
src/HDFPersist/CMakeLists.txt	[deleted file]	blob \| history
src/HDFPersist/HDFascii.cc		diff \| blob \| history
src/HDFPersist/Makefile.am		diff \| blob \| history
src/KERNEL_PY/CMakeLists.txt	[deleted file]	blob \| history
src/KERNEL_PY/kernel/CMakeLists.txt	[deleted file]	blob \| history
src/KERNEL_PY/kernel/parametric/CMakeLists.txt	[deleted file]	blob \| history
src/KERNEL_PY/salome.py	[new file with mode: 0755]	blob
src/KERNEL_PY/salome_study.py		diff \| blob \| history
src/KernelHelpers/CMakeLists.txt	[deleted file]	blob \| history
src/KernelHelpers/Test/CMakeLists.txt	[deleted file]	blob \| history
src/KernelHelpers/Test/KernelHelpersUnitTests.hxx		diff \| blob \| history
src/Launcher/BatchTest.cxx		diff \| blob \| history
src/Launcher/CMakeLists.txt	[deleted file]	blob \| history
src/Launcher/Launcher.cxx		diff \| blob \| history
src/Launcher/Launcher_Job_Command.cxx		diff \| blob \| history
src/Launcher/Launcher_Job_SALOME.cxx		diff \| blob \| history
src/LifeCycleCORBA/CMakeLists.txt	[deleted file]	blob \| history
src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx		diff \| blob \| history
src/LifeCycleCORBA/Test/CMakeLists.txt	[deleted file]	blob \| history
src/LifeCycleCORBA/Test/LifeCycleCORBATest.cxx		diff \| blob \| history
src/LifeCycleCORBA/Test/LifeCycleCORBATest.hxx		diff \| blob \| history
src/LifeCycleCORBA_SWIG/CMakeLists.txt	[deleted file]	blob \| history
src/LifeCycleCORBA_SWIG/Makefile.am		diff \| blob \| history
src/LifeCycleCORBA_SWIG/Test/CMakeLists.txt	[deleted file]	blob \| history
src/Logger/CMakeLists.txt	[deleted file]	blob \| history
src/Logger/Test/CMakeLists.txt	[deleted file]	blob \| history
src/MPIContainer/CMakeLists.txt	[deleted file]	blob \| history
src/MPIContainer/MPIContainer_i.cxx		diff \| blob \| history
src/Makefile.am		diff \| blob \| history
src/ModuleCatalog/CMakeLists.txt	[deleted file]	blob \| history
src/ModuleGenerator/CMakeLists.txt	[deleted file]	blob \| history
src/ModuleGenerator/Makefile.am		diff \| blob \| history
src/NOTIFICATION_SWIG/CMakeLists.txt	[deleted file]	blob \| history
src/NOTIFICATION_SWIG/Makefile.am		diff \| blob \| history
src/NamingService/CMakeLists.txt	[deleted file]	blob \| history
src/NamingService/Test/CMakeLists.txt	[deleted file]	blob \| history
src/NamingService/Test/NamingServiceTest.cxx		diff \| blob \| history
src/NamingService/Test/NamingServiceTest.hxx		diff \| blob \| history
src/Notification/CMakeLists.txt	[deleted file]	blob \| history
src/ParallelContainer/CMakeLists.txt	[deleted file]	blob \| history
src/Registry/CMakeLists.txt	[deleted file]	blob \| history
src/ResourcesManager/CMakeLists.txt	[deleted file]	blob \| history
src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx		diff \| blob \| history
src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx		diff \| blob \| history
src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx		diff \| blob \| history
src/ResourcesManager/SALOME_ResourcesManager.cxx		diff \| blob \| history
src/SALOMEDS/CMakeLists.txt	[deleted file]	blob \| history
src/SALOMEDS/Makefile.am		diff \| blob \| history
src/SALOMEDS/SALOMEDS_AttributeStudyProperties.cxx		diff \| blob \| history
src/SALOMEDS/SALOMEDS_AttributeStudyProperties.hxx		diff \| blob \| history
src/SALOMEDS/SALOMEDS_AttributeStudyProperties_i.cxx		diff \| blob \| history
src/SALOMEDS/SALOMEDS_AttributeStudyProperties_i.hxx		diff \| blob \| history
src/SALOMEDS/SALOMEDS_Driver_i.cxx		diff \| blob \| history
src/SALOMEDS/SALOMEDS_Driver_i.hxx		diff \| blob \| history
src/SALOMEDS/SALOMEDS_StudyBuilder.cxx		diff \| blob \| history
src/SALOMEDS/SALOMEDS_StudyManager.cxx		diff \| blob \| history
src/SALOMEDS/SALOMEDS_StudyManager_i.cxx		diff \| blob \| history
src/SALOMEDS/SALOME_DriverPy.py		diff \| blob \| history
src/SALOMEDS/Test/CMakeLists.txt	[deleted file]	blob \| history
src/SALOMEDS/Test/Makefile.am		diff \| blob \| history
src/SALOMEDS/Test/SALOMEDSTest.hxx		diff \| blob \| history
src/SALOMEDS/Test/TestSALOMEDS.cxx		diff \| blob \| history
src/SALOMEDSClient/CMakeLists.txt	[deleted file]	blob \| history
src/SALOMEDSClient/SALOMEDSClient_AttributeStudyProperties.hxx		diff \| blob \| history
src/SALOMEDSImpl/CMakeLists.txt	[deleted file]	blob \| history
src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx		diff \| blob \| history
src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.hxx		diff \| blob \| history
src/SALOMEDSImpl/SALOMEDSImpl_Driver.hxx		diff \| blob \| history
src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx		diff \| blob \| history
src/SALOMEDSImpl/SALOMEDSImpl_UseCaseBuilder.cxx		diff \| blob \| history
src/SALOMEDSImpl/Test/CMakeLists.txt	[deleted file]	blob \| history
src/SALOMEDSImpl/Test/SALOMEDSImplTest.hxx		diff \| blob \| history
src/SALOMELocalTrace/CMakeLists.txt	[deleted file]	blob \| history
src/SALOMELocalTrace/Test/CMakeLists.txt	[deleted file]	blob \| history
src/SALOMELocalTrace/Test/SALOMELocalTraceTest.cxx		diff \| blob \| history
src/SALOMELocalTrace/Test/SALOMELocalTraceTest.hxx		diff \| blob \| history
src/SALOMETraceCollector/CMakeLists.txt	[deleted file]	blob \| history
src/SALOMETraceCollector/Test/CMakeLists.txt	[deleted file]	blob \| history
src/SALOMETraceCollector/Test/SALOMETraceCollectorTest.cxx		diff \| blob \| history
src/SALOMETraceCollector/Test/SALOMETraceCollectorTest.hxx		diff \| blob \| history
src/TOOLSDS/CMakeLists.txt	[deleted file]	blob \| history
src/TestContainer/CMakeLists.txt	[deleted file]	blob \| history
src/TestContainer/Makefile.am		diff \| blob \| history
src/TestContainer/TestComponentPy.py	[new file with mode: 0755]	blob
src/TestMPIContainer/CMakeLists.txt	[deleted file]	blob \| history
src/UnitTests/CMakeLists.txt	[deleted file]	blob \| history
src/Utils/CMakeLists.txt	[deleted file]	blob \| history
src/Utils/Test/CMakeLists.txt	[deleted file]	blob \| history
src/Utils/Test/TestUtils.py		diff \| blob \| history
src/Utils/Test/UtilsTest.cxx		diff \| blob \| history
src/Utils/Test/UtilsTest.hxx		diff \| blob \| history

SALOME Kernel module

RSS Atom