From: jean-claude <jean-claude.charr@univ-fcomte.fr>
Date: Fri, 31 Oct 2014 07:28:59 +0000 (+0100)
Subject: Corrected some conflicts, paper corrected till line 656
X-Git-Tag: pdsec15_submission~85
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/mpi-energy2.git/commitdiff_plain/cb70815089ce5015bfb95cf39990a9daafa03b0a?ds=inline;hp=cb70815089ce5015bfb95cf39990a9daafa03b0a

Corrected some conflicts, paper corrected till line 656
Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/mpi-energy2

Conflicts:
	Heter_paper.tex
---