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)
Conflicts:
source/unres/src_MD-M/cinfo.f
source/wham/src-M/cinfo.f


No differences found