Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' into mc-process
authorGabriel Corona <gabriel.corona@loria.fr>
Tue, 14 Apr 2015 12:02:51 +0000 (14:02 +0200)
committerGabriel Corona <gabriel.corona@loria.fr>
Tue, 14 Apr 2015 12:08:02 +0000 (14:08 +0200)
commit9932a0c0d2c44e34633c97a827b2b04d615cb4e9
treeaaca6c570786fe369087064a34144ed6bb9d33d6
parentda7ddf47cca7f83884a15a05778d3909fd0e4cfd
parentec855b2eab2825f3870232ef7e0a804963231b0e
Merge branch 'master' into mc-process

Conflicts:
teshsuite/mc/replay/random_bug.c
25 files changed:
buildtools/Cmake/CompleteInFiles.cmake
buildtools/Cmake/DefinePackages.cmake
buildtools/Cmake/src/internal_config.h.in
examples/msg/mc/bugged1.c
examples/msg/mc/bugged1_liveness.c
examples/msg/mc/bugged2.c
examples/msg/mc/bugged2_liveness.c
examples/msg/mc/bugged3.c
examples/msg/mc/electric_fence.c
src/mc/mc_base.c
src/mc/mc_global.c
src/mc/mc_private.h
src/mc/mc_process.h
src/mc/mc_record.c
src/msg/msg_mailbox.c
src/simgrid/sg_config.c
src/simix/popping_generated.c
src/simix/smx_global.c
src/simix/smx_process.c
src/smpi/private.h
src/smpi/smpi_base.c
src/smpi/smpi_bench.c
src/smpi/smpi_global.c
src/surf/surf_interface.cpp
teshsuite/mc/replay/random_bug.c