Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Fixed conflicts - Adrien
authoralebre <adrien.lebre@inria.fr>
Thu, 31 Jan 2013 16:13:06 +0000 (17:13 +0100)
committeralebre <adrien.lebre@inria.fr>
Thu, 31 Jan 2013 16:13:06 +0000 (17:13 +0100)
commit91a6a44e2c65ccb75ab5751faf43c98e547e7451
tree960e4751c8ac89517c1abaeda144feac573dfc2b
parentb9f7679a9cc888f0beedd88cf066c1d87ecb5191
parent280afb44a51d970f116dbe52ccf16989136e21da
Fixed conflicts - Adrien
src/include/surf/surf.h
src/msg/msg_vm.c
src/simix/smx_vm.c
src/surf/vm_workstation.c