Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' into mc
authorGabriel Corona <gabriel.corona@loria.fr>
Mon, 27 Apr 2015 08:33:01 +0000 (10:33 +0200)
committerGabriel Corona <gabriel.corona@loria.fr>
Mon, 27 Apr 2015 08:33:41 +0000 (10:33 +0200)
commitd13b1659a0c2551ee41b287a269e391bb2d7bc8a
tree08e634df4221a91cb89a258ff747b6b46c8880cd
parent510d3716010b117855620a4e79f0ba78de43346d
parent25ed869bd9f1204b424847f48e62eaefb50604dc
Merge branch 'master' into mc

Conflicts:
buildtools/Cmake/DefinePackages.cmake
src/mc/mc_request.cpp
buildtools/Cmake/DefinePackages.cmake
src/mc/mc_request.cpp
src/mc/mc_unw_vmread.cpp
src/simix/libsmx.c
src/simix/smx_global.c
src/simix/smx_process.c