From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Sun, 29 Sep 2019 16:41:47 +0000 (+0200)
Subject: Merge branch 'rework-energy-plugin' into 'master'
X-Git-Tag: v3.24~51
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e9fcd63700db335399382c275547b7e820450e4f?hp=79f4c4c467150b3bea841b968cabd629e9d9282a

Merge branch 'rework-energy-plugin' into 'master'

Rework energy plugin

See merge request simgrid/simgrid!14
---