Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid into...
authorJonathan Rouzaud-Cornabas <jonathan.rouzaud-cornabas@ens-lyon.fr>
Tue, 27 Nov 2012 13:50:16 +0000 (07:50 -0600)
committerJonathan Rouzaud-Cornabas <jonathan.rouzaud-cornabas@ens-lyon.fr>
Tue, 27 Nov 2012 13:50:16 +0000 (07:50 -0600)
commit406f54970c00ca178fa918763d943027bd09e3ba
treeb9c94ddd28fcf5a160511420142568ee713795e3
parentbed55a06c0de08698519ba251e4c4298cc2ff4b6
parent4ede28040ccac8fc9bab86ef8d571838020f2a14
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid 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/instr/instr.h
include/msg/datatypes.h
include/msg/msg.h
include/surf/simgrid_dtd.h
src/instr/instr_config.c
src/instr/instr_private.h
src/instr/instr_routing.c
src/surf/simgrid_dtd.c
src/surf/surf_action.c