Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge 'master' into mc
authorGabriel Corona <gabriel.corona@loria.fr>
Mon, 24 Feb 2014 09:04:38 +0000 (10:04 +0100)
committerGabriel Corona <gabriel.corona@loria.fr>
Mon, 24 Feb 2014 09:04:38 +0000 (10:04 +0100)
commit45c3f1cfee86fb48c96d53f8267f99b6db6e3d7a
tree23984f551cfa9877701ba6cec45f416def0d4956
parentfa89cb46ee9cce80179056e44c26ca5de4c4ac9c
parentc7d7dd424bfef179ba41ff0461450f2f231e7125
Merge 'master' into mc

Conflicts:
src/mc/mc_checkpoint.c
src/mc/mc_global.c
src/mc/mc_private.h
21 files changed:
CMakeLists.txt
buildtools/Cmake/CompleteInFiles.cmake
buildtools/Cmake/DefinePackages.cmake
buildtools/Cmake/MakeLib.cmake
include/smpi/mpi.h
include/xbt/mmalloc.h
src/include/mc/datatypes.h
src/include/mc/mc.h
src/mc/mc_checkpoint.c
src/mc/mc_compare.c
src/mc/mc_dpor.c
src/mc/mc_global.c
src/mc/mc_liveness.c
src/mc/mc_memory.c
src/mc/mc_private.h
src/mc/mc_request.c
src/mc/mc_state.c
src/simgrid/sg_config.c
src/simix/smx_network.c
src/xbt/backtrace_linux.c
src/xbt/mmalloc/mm_diff.c