Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'mc_without_ksm' into mc
authorGabriel Corona <gabriel.corona@loria.fr>
Fri, 16 May 2014 13:56:26 +0000 (15:56 +0200)
committerGabriel Corona <gabriel.corona@loria.fr>
Fri, 16 May 2014 13:56:26 +0000 (15:56 +0200)
commita308bb217e5abbd93413e23cb59776c3f6d1d8db
tree2fa6358d5d1eaa4aa72e57c4d502fc22405b0ade
parent3fb1e9f36704ee5d14d1719ef52203086c04f597
parente5302335e3d2d05db342b67533725f631f086ea3
Merge branch 'mc_without_ksm' into mc

Conflicts:
src/mc/mc_dpor.c
src/mc/mc_global.c
src/mc/mc_memory.c
src/mc/mc_dpor.c
src/mc/mc_global.c
src/mc/mc_memory.c
src/mc/mc_private.h
src/xbt/mmalloc/mmprivate.h