Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge scm.gforge.inria.fr:/gitroot/simgrid/simgrid-java
authorSamuel Lepetit <samuel.lepetit@inria.fr>
Tue, 12 Jun 2012 07:58:16 +0000 (09:58 +0200)
committerSamuel Lepetit <samuel.lepetit@inria.fr>
Tue, 12 Jun 2012 07:58:16 +0000 (09:58 +0200)
commitd14a5bb9a5e3388eca71c02b8dfb487cc7db9ce5
tree07647788a61b13ef4fc1308ce897949acd93f730
parent0b7177aaa933483692b39ba8ed330f531f204fac
parentce331ec816422724ce53dd34d6ef785e0d94b9bf
Merge scm.gforge.inria.fr:/gitroot/simgrid/simgrid-java

Conflicts:
src/jmsg_process.c
src/jmsg_process.h
org/simgrid/msg/Process.java
src/jmsg_process.c
src/jmsg_process.h