Salome HOME
Merge from V6_main 11/02/2013
authorvsr <vsr@opencascade.com>
Tue, 12 Feb 2013 09:21:18 +0000 (09:21 +0000)
committervsr <vsr@opencascade.com>
Tue, 12 Feb 2013 09:21:18 +0000 (09:21 +0000)
commit5a898fa18674049bd3e02014ece2036709bd251a
tree6f49fad654909067cb391c0090dd8b473ca00857
parent4bf1713ced3d1eb46f9188cf6e84ef72fb76fa88
Merge from V6_main 11/02/2013
88 files changed:
CMakeLists.txt
ChangeLog
doc/docutils/CMakeLists.txt
doc/salome/gui/CMakeLists.txt
doc/salome/gui/images/icon_about.png
idl/CMakeLists.txt
salome_adm/cmake_files/FindKERNEL.cmake
salome_adm/cmake_files/FindOMNIORB.cmake
salome_adm/cmake_files/FindPLATFORM.cmake
salome_adm/cmake_files/FindPYTHON.cmake
salome_adm/cmake_files/UseOMNIORB.cmake
salome_adm/unix/config_files/check_swig.m4
salome_adm/unix/config_files/check_tbb.m4
src/Basics/CMakeLists.txt
src/CMakeLists.txt
src/Communication/CMakeLists.txt
src/Communication/SALOME_Comm_i.cxx
src/Communication_SWIG/CMakeLists.txt
src/Container/CMakeLists.txt
src/DF/CMakeLists.txt
src/DSC/DSC_Basic/CMakeLists.txt
src/DSC/DSC_Python/CMakeLists.txt
src/DSC/DSC_User/Basic/CMakeLists.txt
src/DSC/DSC_User/CMakeLists.txt
src/DSC/DSC_User/DSC_Exception.hxx
src/DSC/DSC_User/Datastream/CMakeLists.txt
src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt
src/DSC/DSC_User/Datastream/Calcium/fortoc.h
src/DSC/DSC_User/Datastream/CorbaTypeManipulator.hxx
src/DSC/DSC_User/Datastream/Palm/CMakeLists.txt
src/DSC/DSC_User/Datastream/Palm/PalmCouplingPolicy.hxx
src/DSC/ParallelDSC/CMakeLists.txt
src/GenericObj/CMakeLists.txt
src/GenericObj/Makefile.am
src/GenericObj/SALOME_GenericObj_i.cc
src/GenericObj/SALOME_GenericObj_wrap.hxx [new file with mode: 0644]
src/HDFPersist/CMakeLists.txt
src/HDFPersist/HDFascii.cc
src/KERNEL_PY/CMakeLists.txt
src/KernelHelpers/CMakeLists.txt
src/KernelHelpers/SALOME_KernelServices.hxx
src/KernelHelpers/Test/CMakeLists.txt
src/Launcher/CMakeLists.txt
src/LifeCycleCORBA/CMakeLists.txt
src/LifeCycleCORBA/Test/CMakeLists.txt
src/LifeCycleCORBA_SWIG/CMakeLists.txt
src/Logger/CMakeLists.txt
src/MPIContainer/CMakeLists.txt
src/ModuleCatalog/CMakeLists.txt
src/NOTIFICATION_SWIG/CMakeLists.txt
src/NamingService/CMakeLists.txt
src/NamingService/Test/CMakeLists.txt
src/Notification/CMakeLists.txt
src/ParallelContainer/CMakeLists.txt
src/Registry/CMakeLists.txt
src/ResourcesManager/CMakeLists.txt
src/SALOMEDS/CMakeLists.txt
src/SALOMEDS/Makefile.am
src/SALOMEDS/SALOMEDS_Attributes_wrap.hxx [new file with mode: 0644]
src/SALOMEDS/SALOMEDS_Driver_i.cxx
src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx
src/SALOMEDS/SALOMEDS_StudyManager_i.cxx
src/SALOMEDS/SALOMEDS_Study_i.cxx
src/SALOMEDS/SALOMEDS_Study_i.hxx
src/SALOMEDS/SALOMEDS_wrap.hxx [new file with mode: 0644]
src/SALOMEDS/Test/CMakeLists.txt
src/SALOMEDSClient/CMakeLists.txt
src/SALOMEDSImpl/CMakeLists.txt
src/SALOMEDSImpl/Makefile.am
src/SALOMEDSImpl/SALOMEDSImpl_AttributeIOR.cxx
src/SALOMEDSImpl/SALOMEDSImpl_AttributeIOR.hxx
src/SALOMEDSImpl/SALOMEDSImpl_AttributeParameter.cxx
src/SALOMEDSImpl/SALOMEDSImpl_Callback.hxx
src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx
src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx
src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx
src/SALOMEDSImpl/Test/CMakeLists.txt
src/SALOMELocalTrace/CMakeLists.txt
src/SALOMELocalTrace/Test/CMakeLists.txt
src/SALOMETraceCollector/CMakeLists.txt
src/SALOMETraceCollector/Test/CMakeLists.txt
src/TOOLSDS/CMakeLists.txt
src/TestContainer/CMakeLists.txt
src/TestMPIContainer/CMakeLists.txt
src/UnitTests/CMakeLists.txt
src/Utils/CMakeLists.txt
src/Utils/Test/CMakeLists.txt
src/Utils/Utils_CorbaException.hxx