Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'dvfs'
authoracarpena <alexandra.carpen-amarie@inria.fr>
Mon, 1 Jul 2013 00:36:14 +0000 (17:36 -0700)
committeracarpena <alexandra.carpen-amarie@inria.fr>
Mon, 1 Jul 2013 00:36:14 +0000 (17:36 -0700)
commita3848e5ea6b2305d6059c89705edaccbec356455
tree5c605b92b1b45c90626d72e88e5611bc254fa5f7
parent0c2d2d0a3bf1d2b76e68c4b57b8ffac9b3f4ee2a
parent080dc09df11aea380c679d3b3ae257826c5cbd44
Merge branch 'dvfs'

Conflicts:
buildtools/Cmake/MakeExe.cmake
src/include/surf/surf.h
src/surf/simgrid_dtd.c
18 files changed:
buildtools/Cmake/DefinePackages.cmake
buildtools/Cmake/MakeExe.cmake
examples/msg/properties/msg_prop.c
include/msg/msg.h
include/simgrid/platf.h
include/simgrid/simix.h
src/include/surf/surf.h
src/msg/msg_host.c
src/simix/smx_host.c
src/simix/smx_host_private.h
src/simix/smx_smurf_private.h
src/simix/smx_user.c
src/surf/cpu_cas01.c
src/surf/simgrid.dtd
src/surf/surf_private.h
src/surf/surf_routing.c
src/surf/surfxml_parse.c
src/surf/workstation.c