Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge with master and fix conflicts
authoralebre <adrien.lebre@inria.fr>
Thu, 21 Feb 2013 12:02:15 +0000 (13:02 +0100)
committeralebre <adrien.lebre@inria.fr>
Thu, 21 Feb 2013 12:02:15 +0000 (13:02 +0100)
commitdc3c3416c4cca30fef7c29422d45094687f59893
treece1ceb1cbe571aaeebdb6093c1f23195adbae115
parent88a573f150347b7a61b6ed2acd1e69da92b7a99b
parent97309bb6b5e9ce0ee6b1e761d5ecb1eddf4ea583
Merge with master and fix conflicts
20 files changed:
buildtools/Cmake/DefinePackages.cmake
include/msg/datatypes.h
include/msg/msg.h
include/simgrid/simix.h
include/xbt/ex.h
src/include/surf/surf.h
src/msg/msg_private.h
src/msg/msg_vm.c
src/simgrid/sg_config.c
src/simix/smx_host.c
src/simix/smx_network.c
src/simix/smx_process.c
src/simix/smx_smurf_private.h
src/simix/smx_user.c
src/surf/storage.c
src/surf/surf.c
src/surf/surf_private.h
src/surf/workstation.c
src/surf/workstation_ptask_L07.c
src/xbt/ex.c