Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'mc'
authorGabriel Corona <gabriel.corona@loria.fr>
Fri, 27 Jun 2014 10:41:21 +0000 (12:41 +0200)
committerGabriel Corona <gabriel.corona@loria.fr>
Fri, 27 Jun 2014 11:06:36 +0000 (13:06 +0200)
commit3080c6b0d097d6b3b7d5b3dda0592154ce438f64
tree064dfb057c7472b615cbc8042a54afe65f38f582
parentcb16738479851b2c9f901c8ee84763fdda017a06
parent87958bc79f4d221653adc8e9c0a2ef690f5249bb
Merge branch 'mc'

Conflicts:
src/mc/mc_global.c
19 files changed:
buildtools/Cmake/AddTests.cmake
buildtools/Cmake/DefinePackages.cmake
buildtools/Cmake/MakeExe.cmake
examples/msg/ns3/ns3.tesh
examples/msg/pastry/pastry_crosstraffic.tesh
examples/smpi/mc/hostfile_bugged1
examples/smpi/mc/hostfile_bugged1_liveness
examples/smpi/mc/hostfile_bugged2
examples/smpi/mc/hostfile_mutual_exclusion
examples/smpi/mc/hostfile_non_deterministic
examples/smpi/mc/hostfile_send_deterministic
examples/smpi/mc/non_deterministic.tesh
include/xbt/sysdep.h
include/xbt/xbt_os_time.h
src/mc/mc_global.c
src/simix/smx_global.c
src/smpi/smpi_global.c
src/xbt/log.c
src/xbt/mmalloc/mm_legacy.c