From: Cezary Czaplewski <czarek@chem.univ.gda.pl>
Date: Mon, 25 Sep 2017 08:34:06 +0000 (+0200)
Subject: Merge branch 'prerelease-3.2.1'
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=commitdiff_plain;h=9453fc761eb545fcb727824c94d012dbf3931951;hp=9453fc761eb545fcb727824c94d012dbf3931951;p=unres.git

Merge branch 'prerelease-3.2.1'

Conflicts:
	bin/unres/MD/unres_ifort_MPICH_E0LL2Y.exe
	bin/wham/wham-mult_ifort_MPICH-GAB.exe
	source/cluster/unres/src/arcos.f
	source/cluster/wham/src-M/arcos.f
	source/cluster/wham/src/arcos.f
	source/wham/src-M/arcos.f
	source/wham/src/arcos.f
	source/xdrfpdb/src-M/arcos.f
	source/xdrfpdb/src/arcos.f
---