Merge branch 'homology' of mmka.chem.univ.gda.pl:unres into homology
authorAdam Liwo <adam@piasek4.chem.univ.gda.pl>
Fri, 31 Jul 2015 14:15:37 +0000 (16:15 +0200)
committerAdam Liwo <adam@piasek4.chem.univ.gda.pl>
Fri, 31 Jul 2015 14:15:37 +0000 (16:15 +0200)
commit20b9694fa7a216e4396722fb449b55dbc448f727
tree8b1634fa0e5c661cb15e10ef6822214c05a0d22a
parent01791e62052ac35cf75895c1a5f3a68ce50a8d0b
parentce4a01bdd7064892903f6375f293fa873fee114b
Merge branch 'homology' of mmka.chem.univ.gda.pl:unres into homology

Conflicts:
source/unres/src_MD/readrtns.F
source/unres/src_MD/readrtns.F