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)
commit11ea3eda73c0b19534cfde7f580aa34d16de2099
treecb486ea55ccf95d3674b6e91f00c0c25f7017645
parentdb23dd17829c754372623bb0067f4655351b31d7
parent6b8a6eb9eb98a6a74a90cbe8da1f254349c9ca4e
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