From: jean-claude <jean-claude.charr@univ-fcomte.fr>
Date: Wed, 7 Oct 2015 13:45:50 +0000 (+0200)
Subject: merged the two versions
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/mpi-energy2.git/commitdiff_plain/137e3f73fedaab51eecf4fea642c4c32e5f68dc7?hp=137e3f73fedaab51eecf4fea642c4c32e5f68dc7

merged the two versions
Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/mpi-energy2
---