Logo AND Algorithmique Numérique Distribuée
Public GIT Repository
projects / simgrid.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29aece3 752dba0)
Merge remote-tracking branch 'origin/master'
authorjean-noel quintin <jnquintin@dhcp-892b9b4c.ucd.ie>
Wed, 10 Oct 2012 10:21:33 +0000 (11:21 +0100)
committerjean-noel quintin <jnquintin@dhcp-892b9b4c.ucd.ie>
Wed, 10 Oct 2012 10:21:33 +0000 (11:21 +0100)
Remove:
examples/smpi/MM/timer.c
examples/smpi/MM/timer.h

1  2 
examples/smpi/MM/2.5D_MM.c patch | diff1 | diff2 | blob | history
examples/smpi/MM/Summa.c patch | diff1 | diff2 | blob | history
examples/smpi/MM/param.c patch | diff1 | diff2 | blob | history

diff --cc examples/smpi/MM/2.5D_MM.c
Simple merge
diff --cc examples/smpi/MM/Summa.c
Simple merge
diff --cc examples/smpi/MM/param.c
Simple merge
Clone of SimGrid repository with local patches