Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of git://scm.gforge.inria.fr/simgrid/simgrid-java
authoralebre <alebre@noname-2.local>
Tue, 12 Jun 2012 20:44:02 +0000 (22:44 +0200)
committeralebre <alebre@noname-2.local>
Tue, 12 Jun 2012 20:44:02 +0000 (22:44 +0200)
commit0fee76cf390f76e01411439d6f3590ac7dc158ff
tree1bddaa046134d25d9439ee46532ddcd8011a9ab1
parentcd247d4e096b930f7f41eab3bfc9683adfccb39c
parenta8386a00238d13b282abb5884ee51d0cb30e0361
Merge branch 'master' of git://scm.gforge.inria.fr/simgrid/simgrid-java

Conflicts:
CMakeLists.txt
ChangeLog
CMakeLists.txt
ChangeLog