Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
merge conflicts
authorMarion Guthmuller <marion.guthmuller@loria.fr>
Tue, 22 Nov 2011 17:05:23 +0000 (18:05 +0100)
committerMarion Guthmuller <marion.guthmuller@loria.fr>
Tue, 22 Nov 2011 17:05:23 +0000 (18:05 +0100)
commitedde8f7fbc1b74a81551bf9eb7bac1935b999296
tree1d1b5fec3359c1cf7918806f6060a6250f56ecba
parent6229ff3a39c8fb195846ea9eb67cf071654de597
parentc9fa3b2f54b1793ba420c06fed2f7bf4ec04b30f
merge conflicts
buildtools/Cmake/DefinePackages.cmake
include/msg/msg.h
src/mc/mc_global.c
src/mc/memory_map.c
src/msg/msg_global.c
src/simix/smx_smurf.c
src/xbt/dynar.c
src/xbt/mmalloc/mm_legacy.c