]> SALOME platform Git repositories - modules/med.git/commit
Salome HOME
Merge branch 'abn/mpi_imp'
authorabn <adrien.bruneton@cea.fr>
Tue, 1 Dec 2015 15:35:56 +0000 (16:35 +0100)
committerabn <adrien.bruneton@cea.fr>
Tue, 1 Dec 2015 15:35:56 +0000 (16:35 +0100)
commit83e8c2e366e979fca040ac4ae86484847c01be15
treeba8b874bbc70226010d60b3ebb7ca2663ae05061
parentb2a9b4c2e1e3061ea955975b7ad5a1b0f0d2352a
parent59bcca0a2bcc2c0d9178e646e690b0f1a6ff23c5
Merge branch 'abn/mpi_imp'

Conflicts:
src/ParaMEDMEMTest/ParaMEDMEMTest.hxx - due to the move of MDLoader tests
src/ParaMEDMEMTest/CMakeLists.txt
src/ParaMEDMEMTest/ParaMEDMEMTest.hxx