Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'mc++'
authorGabriel Corona <gabriel.corona@loria.fr>
Fri, 21 Mar 2014 11:45:05 +0000 (12:45 +0100)
committerGabriel Corona <gabriel.corona@loria.fr>
Fri, 21 Mar 2014 11:45:05 +0000 (12:45 +0100)
commitf2df13795e01302813a6aef10825ec7e922ce530
tree23397b90238ff74c06d5088236040b464510c7f4
parent7baa77e301b3581d4107cbbaab44183aa6b9b918
parent0b83205608b7fc3e935b970509a08e381ad1dffe
Merge branch 'mc++'

Conflicts:
src/simgrid/sg_config.c
src/xbt/mmalloc/mm_diff.c
13 files changed:
CMakeLists.txt
buildtools/Cmake/AddTests.cmake
buildtools/Cmake/CompleteInFiles.cmake
buildtools/Cmake/DefinePackages.cmake
buildtools/Cmake/MakeExe.cmake
buildtools/Cmake/MakeLib.cmake
src/include/mc/mc.h
src/mc/mc_memory.c
src/simgrid/sg_config.c
src/simix/smx_network.c
src/smpi/smpi_base.c
src/smpi/smpi_global.c
src/xbt/mmalloc/mm_diff.c