Logo AND Algorithmique Numérique Distribuée
Public GIT Repository
projects / simgrid.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 09dc52c 15859bf)
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
authorMarion Guthmuller <marion.guthmuller@loria.fr>
Thu, 19 Jan 2012 09:38:27 +0000 (10:38 +0100)
committerMarion Guthmuller <marion.guthmuller@loria.fr>
Thu, 19 Jan 2012 09:38:27 +0000 (10:38 +0100)
Conflicts:
examples/msg/chord/chord_stateful.c


Trivial merge
Clone of SimGrid repository with local patches