Merge branch 'prerelease-3.2.1'
authorCezary Czaplewski <czarek@chem.univ.gda.pl>
Mon, 25 Sep 2017 08:34:06 +0000 (10:34 +0200)
committerCezary Czaplewski <czarek@chem.univ.gda.pl>
Mon, 25 Sep 2017 08:34:06 +0000 (10:34 +0200)
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


No differences found