Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' into mc-process
authorGabriel Corona <gabriel.corona@loria.fr>
Tue, 10 Mar 2015 11:13:14 +0000 (12:13 +0100)
committerGabriel Corona <gabriel.corona@loria.fr>
Tue, 10 Mar 2015 12:00:28 +0000 (13:00 +0100)
commit2bd9a37bbb72eac4ed613b3d6953aba6555e2e92
tree89f447e4011392553b379f28d7429d974165ad68
parentaeb48ba02b7ee7fc14922d9dc9c1ee5ca30e8c48
parent0cb036c32d50dfedd6e649ba3cd60ba063d40542
Merge branch 'master' into mc-process

Conflicts:
examples/smpi/mc/non_deterministic.tesh
examples/smpi/mc/only_send_deterministic.tesh
src/include/mc/mc.h
src/mc/mc_base.c
src/mc/mc_comm_determinism.c
src/mc/mc_config.c
src/mc/mc_global.c
src/mc/mc_page_snapshot.cpp
src/mc/mc_request.c
17 files changed:
buildtools/Cmake/CompleteInFiles.cmake
buildtools/Cmake/DefinePackages.cmake
examples/smpi/mc/only_send_deterministic.tesh
src/include/mc/mc.h
src/mc/mc_base.c
src/mc/mc_comm_determinism.c
src/mc/mc_compare.cpp
src/mc/mc_config.c
src/mc/mc_global.c
src/mc/mc_page_snapshot.cpp
src/mc/mc_private.h
src/mc/mc_request.c
src/mc/mc_safety.c
src/mc/mc_snapshot.h
src/mc/mc_state.c
src/simgrid/sg_config.c
src/surf/surf_interface.cpp