Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'surf++'
authorPaul Bédaride <paul.bedaride@gmail.com>
Fri, 15 Nov 2013 14:27:48 +0000 (15:27 +0100)
committerPaul Bédaride <paul.bedaride@gmail.com>
Fri, 15 Nov 2013 14:27:48 +0000 (15:27 +0100)
commit281f8c29e177852dcb1591fc31e363e1176857c8
tree8076bf515b391bd04b1b57583838ae8fc1a7efac
parentb9734b132bcaf8a26ec1dbfcc71176e7182b5b0e
parenteee21ec5f99218189fc98898a09150294cd0fbf4
Merge branch 'surf++'

Conflicts:
src/include/surf/surf.h
src/instr/instr_private.h
src/simix/smx_smurf_private.h
src/smpi/smpi_bench.c
src/surf/workstation.c
25 files changed:
CMakeLists.txt
buildtools/Cmake/DefinePackages.cmake
buildtools/Cmake/Flags.cmake
include/msg/msg.h
include/simgrid/simix.h
include/xbt/ex.h
src/include/surf/maxmin.h
src/include/surf/surf.h
src/instr/instr_private.h
src/msg/msg_host.c
src/simgrid/sg_config.c
src/simix/smx_io.c
src/simix/smx_network.c
src/simix/smx_smurf_private.h
src/simix/smx_user.c
src/smpi/smpi_bench.c
src/surf/maxmin.c
src/surf/network.c
src/surf/storage.c
src/surf/storage.cpp
src/surf/storage.hpp
src/surf/surf.c
src/surf/surf_interface.cpp
src/surf/workstation.c
src/xbt/log.c