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>
Fri, 23 Jan 2015 20:30:52 +0000 (21:30 +0100)
committerAdam Liwo <adam@piasek4.chem.univ.gda.pl>
Fri, 23 Jan 2015 20:30:52 +0000 (21:30 +0100)
commitc16c0dde5e41c15776ead4accc08b9cdbe742607
tree0dd6c171c7344370b350c1852d22b3b7c4bf62c7
parente39b9b369e87de20bb1826764be18633ea348f58
parent9a082c1ab203120d8e865971546d473fb146fcdc
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/unres/src_MD-M/refsys.f
source/unres/src_MD-M/cinfo.f
source/unres/src_MD-M/refsys.f