Logo AND Algorithmique Numérique Distribuée
Public GIT Repository
projects / simgrid.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83699b2 5d98a94)
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
authorMartin Quinson <martin.quinson@loria.fr>
Fri, 17 Jun 2016 09:39:43 +0000 (11:39 +0200)
committerMartin Quinson <martin.quinson@loria.fr>
Fri, 17 Jun 2016 09:39:43 +0000 (11:39 +0200)
1  2 
include/simgrid/s4u/actor.hpp patch | diff1 | diff2 | blob | history

diff --cc include/simgrid/s4u/actor.hpp
Simple merge
Clone of SimGrid repository with local patches