Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into tomerge
authorMartin Quinson <martin.quinson@loria.fr>
Fri, 24 Jul 2015 12:53:09 +0000 (14:53 +0200)
committerMartin Quinson <martin.quinson@loria.fr>
Fri, 24 Jul 2015 12:53:09 +0000 (14:53 +0200)
commit242fde5e8077f8193db4df5f262a9672085c8d8a
tree201be94a13c4b966398aef67affffe1f71ba64e9
parente798113213523f9bafbcb59805ed2545a3716261
parentd896265a56dbf34328e32566da1932835d840d27
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into tomerge

Conflicts:
buildtools/Cmake/DefinePackages.cmake
buildtools/Cmake/DefinePackages.cmake
include/simgrid/platf.h
src/surf/surf_routing.cpp
src/surf/surf_routing_cluster.cpp
src/surf/surf_routing_cluster_fat_tree.cpp
src/surf/surf_routing_cluster_torus.cpp
src/surf/surfxml_parse.c