From: acarpena <alexandra.carpen-amarie@inria.fr>
Date: Fri, 5 Jul 2013 01:53:41 +0000 (+0000)
Subject: Merge branch 'dvfs'
X-Git-Tag: v3_9_90~203
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9e6224ecd95ff7b6452fe9b2c088138877797542

Merge branch 'dvfs'

Added DVFS and energy consumption support.
---

9e6224ecd95ff7b6452fe9b2c088138877797542