Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' into vmtrace
authoralebre <alebre@dhcp-3-69.rech172-28.emn.fr>
Wed, 24 Oct 2012 10:56:36 +0000 (12:56 +0200)
committeralebre <alebre@dhcp-3-69.rech172-28.emn.fr>
Wed, 24 Oct 2012 10:56:36 +0000 (12:56 +0200)
commit5fa8d6780a107eb5ae1ff8a233b0dd23cb065f8a
treeaf03426fedb04e0fae6820e1177b73875a00154b
parent8e2e629ea81607a0687ef08e2630c5fc1403688b
parent1601d48185d2455b18eec9230869d3d6dbc486c5
Merge branch 'master' into vmtrace

Conflicts:
include/surf/simgrid_dtd.h
src/surf/simgrid_dtd.c
buildtools/Cmake/DefinePackages.cmake
examples/msg/cloud/masterslave_virtual_machines.c
include/msg/msg.h