Logo AND Algorithmique Numérique Distribuée
Public GIT Repository
projects / simgrid.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: add044a 8fb2632)
Merge branch 'hypervisor' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into hypervisor
authorTakahiro Hirofuchi <t.hirofuchi+sg@aist.go.jp>
Thu, 21 Feb 2013 14:10:11 +0000 (15:10 +0100)
committerTakahiro Hirofuchi <t.hirofuchi+sg@aist.go.jp>
Thu, 21 Feb 2013 14:10:11 +0000 (15:10 +0100)
sync again

1  2 
include/simgrid/simix.h patch | diff1 | diff2 | blob | history
src/msg/msg_private.h patch | diff1 | diff2 | blob | history

diff --cc include/simgrid/simix.h
Simple merge
diff --cc src/msg/msg_private.h
Simple merge
Clone of SimGrid repository with local patches