Merge branch 'prerelease-3.2.1' of mmka.chem.univ.gda.pl:unres into prerelease-3.2.1
authorAdam Liwo <adam@piasek4.chem.univ.gda.pl>
Mon, 5 Jan 2015 05:50:09 +0000 (06:50 +0100)
committerAdam Liwo <adam@piasek4.chem.univ.gda.pl>
Mon, 5 Jan 2015 05:50:09 +0000 (06:50 +0100)
commit6b08284b475774e5fbcbab87f9d0b51493380924
treed187e41872172d3e2aaa6a7e52a001eaef7fa027
parent09c4fca572a3a0917824d87c50b17094843251cc
parent9934d25294a5371b80013e77a7abadcd95491afe
Merge branch 'prerelease-3.2.1' of mmka.chem.univ.gda.pl:unres into prerelease-3.2.1

Conflicts:
source/unres/src_MD-M/cinfo.f
source/wham/src-M/cinfo.f
source/unres/src_MD-M/cinfo.f
source/wham/src-M/cinfo.f