From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Fri, 31 Mar 2023 11:54:08 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Tag: v3.34~247
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/2865b4adad00b379d59f8ef1b9ed31ed1a7045ef

Merge branch 'master' into 'master'

Add battery plugin and fix DAG doc

See merge request simgrid/simgrid!142
---

2865b4adad00b379d59f8ef1b9ed31ed1a7045ef