Logo AND Algorithmique Numérique Distribuée
Public GIT Repository
projects / simgrid.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 79f4c4c)
Merge branch 'master' into 'rework-energy-plugin'
authorMartin Quinson <martin.quinson@ens-rennes.fr>
Fri, 27 Sep 2019 22:01:57 +0000 (00:01 +0200)
committerMartin Quinson <martin.quinson@ens-rennes.fr>
Fri, 27 Sep 2019 22:01:57 +0000 (00:01 +0200)
# Conflicts:
#   include/simgrid/plugins/energy.h


No differences found
Clone of SimGrid repository with local patches