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)
commit71ab8ad9b5eacd0bbf5c069f91191d293f43f4de
treeaa7e98eabc109e850f5bc24ffa514d5167baeb99
parentb62c40f2579be77cdde76421ddfe0f216f42944f
parent641d04ddae7b3a57c3c949f3f980374896c94b58
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